From 7e77e8672af46331666c958a94edeed2fa89993b Mon Sep 17 00:00:00 2001
From: Sean Gilligan <sean@msgilligan.com>
Date: Mon, 21 Jul 2025 12:17:58 -0700
Subject: [PATCH] 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`.
---
 .github/workflows/ubuntu.yml | 6 +++---
 setup-nixos.sh               | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index ade3464..03d5bd6 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -18,7 +18,7 @@ jobs:
     env:
       # HOST_ARCH value must match string in Lima download filename
       HOST_ARCH: ${{ matrix.os == 'ubuntu-24.04' && 'x86_64' || (matrix.os == 'ubuntu-24.04-arm' && 'aarch64') || 'unknown' }}
-      LIMA_VERSION: "v1.0.6"
+      LIMA_VERSION: "v1.2.1"
       GUEST_HOST_NAME: "nixsample"
       GUEST_USER: "lima"
     name: NixOS-${{ matrix.guest-arch }} Lima on ${{ matrix.os }}
@@ -42,7 +42,7 @@ jobs:
         id: lima-actions-setup
         with:
           version: ${{ env.LIMA_VERSION }}
-          additional_guestagents: ${{ matrix.os == 'ubuntu-24.04' && 'false' || (matrix.os == 'ubuntu-24.04-arm' && 'true') || 'false' }}
+          additional_guestagents: true
 
       - name: "Cache ~/.cache/lima"
         uses: actions/cache@v4
@@ -56,7 +56,7 @@ jobs:
           QEMU_SYSTEM_AARCH64: ${{ env.HOST_ARCH == 'aarch64' && 'qemu-system-aarch64 -machine virt -cpu max' || 'qemu-system-aarch64' }}
         run: |
           set -eux
-          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
+          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
 
       - name: "Update and Rebuild NixOS"
         run: |
diff --git a/setup-nixos.sh b/setup-nixos.sh
index 92d0318..a1c797f 100755
--- a/setup-nixos.sh
+++ b/setup-nixos.sh
@@ -58,4 +58,4 @@ limactl shell $GUEST_HOST_NAME -- sudo bash -c "cd /etc/nixos ; git checkout mas
 limactl shell $GUEST_HOST_NAME -- sudo nixos-rebuild boot --flake .#$GUEST_CONFIG_NAME
 sleep 1
 limactl stop $GUEST_HOST_NAME
-limactl start $GUEST_HOST_NAME
+LIMA_SSH_PORT_FORWARDER=true LIMA_USERNET_RESOLVE_IP_ADDRESS_TIMEOUT=5 limactl start $GUEST_HOST_NAME