From e57037a8556019b3168d158679bf916e07b17719 Mon Sep 17 00:00:00 2001 From: DavHau Date: Wed, 6 Dec 2023 00:23:56 +0700 Subject: [PATCH 1/3] update ubuntu cloud image --- flake.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 27878d9..f820295 100644 --- a/flake.nix +++ b/flake.nix @@ -85,8 +85,8 @@ }; ubuntu = { system = "x86_64-linux"; - url = "https://cloud-images.ubuntu.com/jammy/20230914/jammy-server-cloudimg-amd64.img"; - sha256 = "1lvhgla02g6f4ahzsczaq35ci76b54i4x5xmgywiramrqci19hxk"; + url = "https://cloud-images.ubuntu.com/noble/20231031/noble-server-cloudimg-amd64.img"; + sha256 = "0vh3fk6w1zi8grqlark2ddqlsr8bx3ixj2cbgl8kwiciv4zz07w2"; extraVirtCustomizeCommands = [ "--copy-in ${./testing/ubuntu}/01-netplan.yaml:/etc/netplan/" "--upload ${./testing}/id_ed25519:/etc/ssh/ssh_host_ed25519_key" From 47e1f1a4e971435e3d2fd27d7961dd42afb1a56f Mon Sep 17 00:00:00 2001 From: DavHau Date: Wed, 6 Dec 2023 10:06:05 +0700 Subject: [PATCH 2/3] Update flake.nix Co-authored-by: Michael Hoang --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index f820295..68b57ce 100644 --- a/flake.nix +++ b/flake.nix @@ -85,7 +85,7 @@ }; ubuntu = { system = "x86_64-linux"; - url = "https://cloud-images.ubuntu.com/noble/20231031/noble-server-cloudimg-amd64.img"; + url = "https://web.archive.org/web/20231205213242/https://cloud-images.ubuntu.com/noble/20231031/noble-server-cloudimg-amd64.img"; sha256 = "0vh3fk6w1zi8grqlark2ddqlsr8bx3ixj2cbgl8kwiciv4zz07w2"; extraVirtCustomizeCommands = [ "--copy-in ${./testing/ubuntu}/01-netplan.yaml:/etc/netplan/" From 1fa859a110e1dfdcad7c2a11d3ddb65f97629582 Mon Sep 17 00:00:00 2001 From: DavHau Date: Wed, 6 Dec 2023 14:47:56 +0700 Subject: [PATCH 3/3] also enable binfmt for the VM tests fixes error when nix tries to build stuff for aarch64 --- .github/workflows/nix-portable.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/nix-portable.yml b/.github/workflows/nix-portable.yml index 80b1260..9640d03 100644 --- a/.github/workflows/nix-portable.yml +++ b/.github/workflows/nix-portable.yml @@ -83,6 +83,15 @@ jobs: name: nix-portable authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + with: + image: tonistiigi/binfmt@sha256:8de6f2decb92e9001d094534bf8a92880c175bd5dfb4a9d8579f26f09821cfa2 + platforms: all + + - name: Install binfmt support + run: sudo apt-get install -y + - run: 'nix run -L .#job-qemu-${{ matrix.qemu_os }}'