From dcf2799ed415608ff905b4731f72be74b18eccd8 Mon Sep 17 00:00:00 2001 From: buffet Date: Tue, 11 Jun 2024 19:48:50 +0200 Subject: [PATCH 1/2] feat: re-label forgejo workers to include the arch --- hosts/ami/forgejo-action-runner.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/ami/forgejo-action-runner.nix b/hosts/ami/forgejo-action-runner.nix index 2f20807..8207891 100644 --- a/hosts/ami/forgejo-action-runner.nix +++ b/hosts/ami/forgejo-action-runner.nix @@ -19,7 +19,7 @@ in { inherit name; url = config.services.forgejo.settings.server.ROOT_URL; tokenFile = config.age.secrets.kitchen-runner-token.path; - labels = ["docker" "ubuntu-latest:docker://ghcr.io/catthehacker/ubuntu:act-latest"]; + labels = ["docker-aarch64" "ubuntu-latest-aarch64:docker://ghcr.io/catthehacker/ubuntu:act-latest"]; settings = { log.level = "warn"; container.network = "host"; From 144ef81199aab9e82b8edf748ca23d2e1d02ea23 Mon Sep 17 00:00:00 2001 From: buffet Date: Tue, 11 Jun 2024 19:49:29 +0200 Subject: [PATCH 2/2] ci: use ubuntu-latest-aarch64 instead of ubuntu-latest --- .forgejo/workflows/ci.yaml | 2 +- .forgejo/workflows/update-flake.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/ci.yaml b/.forgejo/workflows/ci.yaml index d36c6e0..a6b01dd 100644 --- a/.forgejo/workflows/ci.yaml +++ b/.forgejo/workflows/ci.yaml @@ -9,7 +9,7 @@ env: jobs: check: - runs-on: ubuntu-latest + runs-on: ubuntu-latest-aarch64 steps: - uses: https://github.com/docker/setup-qemu-action@v3 - uses: actions/checkout@v4 diff --git a/.forgejo/workflows/update-flake.yaml b/.forgejo/workflows/update-flake.yaml index bbfdb75..4e6c56c 100644 --- a/.forgejo/workflows/update-flake.yaml +++ b/.forgejo/workflows/update-flake.yaml @@ -4,7 +4,7 @@ on: jobs: update-flake: - runs-on: ubuntu-latest + runs-on: ubuntu-latest-aarch64 steps: - uses: actions/checkout@v4 - uses: https://github.com/cachix/install-nix-action@v26