Skip to content

Commit 7e77e86

Browse files
committed
GHA ubuntu.yml: Upgrade LIMA_VERSION to 1.2.1
This requires a fix to make sure additional_gestagents is really set to `true` (which hardcodes it to true even though not needed for x86_64) Also set `LIMA_SSH_PORT_FORWARDER=true` and `LIMA_USERNET_RESOLVE_IP_ADDRESS_TIMEOUT=5` on the `limactl` command line Note: This commit also adds `LIMA_SSH_PORT_FORWARDER` and `LIMA_USERNET_RESOLVE_IP_ADDRESS_TIMEOUT` to the `limactl start` command in `setup-nixos.sh`.
1 parent 4154f7b commit 7e77e86

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/workflows/ubuntu.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
env:
1919
# HOST_ARCH value must match string in Lima download filename
2020
HOST_ARCH: ${{ matrix.os == 'ubuntu-24.04' && 'x86_64' || (matrix.os == 'ubuntu-24.04-arm' && 'aarch64') || 'unknown' }}
21-
LIMA_VERSION: "v1.0.6"
21+
LIMA_VERSION: "v1.2.1"
2222
GUEST_HOST_NAME: "nixsample"
2323
GUEST_USER: "lima"
2424
name: NixOS-${{ matrix.guest-arch }} Lima on ${{ matrix.os }}
@@ -42,7 +42,7 @@ jobs:
4242
id: lima-actions-setup
4343
with:
4444
version: ${{ env.LIMA_VERSION }}
45-
additional_guestagents: ${{ matrix.os == 'ubuntu-24.04' && 'false' || (matrix.os == 'ubuntu-24.04-arm' && 'true') || 'false' }}
45+
additional_guestagents: true
4646

4747
- name: "Cache ~/.cache/lima"
4848
uses: actions/cache@v4
@@ -56,7 +56,7 @@ jobs:
5656
QEMU_SYSTEM_AARCH64: ${{ env.HOST_ARCH == 'aarch64' && 'qemu-system-aarch64 -machine virt -cpu max' || 'qemu-system-aarch64' }}
5757
run: |
5858
set -eux
59-
limactl start --vm-type qemu --arch ${{ matrix.guest-arch }} --name=${{ env.GUEST_HOST_NAME }} --network=lima:user-v2 --set '.user.name = "${{ env.GUEST_USER }}"' nixos.yaml
59+
LIMA_SSH_PORT_FORWARDER=true LIMA_USERNET_RESOLVE_IP_ADDRESS_TIMEOUT=5 limactl start --vm-type qemu --arch ${{ matrix.guest-arch }} --name=${{ env.GUEST_HOST_NAME }} --network=lima:user-v2 --set '.user.name = "${{ env.GUEST_USER }}"' nixos.yaml
6060
6161
- name: "Update and Rebuild NixOS"
6262
run: |

setup-nixos.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,4 @@ limactl shell $GUEST_HOST_NAME -- sudo bash -c "cd /etc/nixos ; git checkout mas
5858
limactl shell $GUEST_HOST_NAME -- sudo nixos-rebuild boot --flake .#$GUEST_CONFIG_NAME
5959
sleep 1
6060
limactl stop $GUEST_HOST_NAME
61-
limactl start $GUEST_HOST_NAME
61+
LIMA_SSH_PORT_FORWARDER=true LIMA_USERNET_RESOLVE_IP_ADDRESS_TIMEOUT=5 limactl start $GUEST_HOST_NAME

0 commit comments

Comments
 (0)