From 309fdfdc7ce195e1f9b703bef90a08b150695c1b Mon Sep 17 00:00:00 2001 From: seth Date: Mon, 27 May 2024 03:14:48 -0600 Subject: nix: fix architecture string for arm image (#1) --- .github/workflows/docker.yaml | 6 +++--- flake.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 8736484..5f4697f 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -25,7 +25,7 @@ jobs: strategy: fail-fast: false matrix: - arch: [x86_64, aarch64] + arch: [x86_64, arm64] runs-on: ubuntu-latest @@ -111,7 +111,7 @@ jobs: env: TAG: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest run: | - architectures=("x86_64" "aarch64") + architectures=("x86_64" "arm64") for arch in "${architectures[@]}"; do docker load < images/container-"$arch"/*.tar.gz docker tag nixpkgs-tracker-bot:latest-"$arch" "$TAG"-"$arch" @@ -120,6 +120,6 @@ jobs: docker manifest create "$TAG" \ --amend "$TAG"-x86_64 \ - --amend "$TAG"-aarch64 + --amend "$TAG"-arm64 docker manifest push "$TAG" diff --git a/flake.nix b/flake.nix index 6763748..1ced965 100644 --- a/flake.nix +++ b/flake.nix @@ -113,10 +113,10 @@ default = packages.nixpkgs-tracker-bot; static-x86_64 = mkStaticForArch "x86_64"; - static-aarch64 = mkStaticForArch "aarch64"; + static-arm64 = mkStaticForArch "aarch64"; container-x86_64 = containerWith packages.static-x86_64; - container-aarch64 = containerWith packages.static-aarch64; + container-arm64 = containerWith packages.static-arm64; }); }; } -- cgit v1.2.3