From 759cc0b053188a6b143dd51abd68b6b78b4046a4 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Mon, 4 Dec 2023 11:04:15 -0500 Subject: [PATCH 1/4] Build on ARM64-Linux --- .github/workflows/build.yaml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 087b1c4..39f69ce 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -71,3 +71,26 @@ jobs: name: magic-nix-cache-X64-Linux path: result/bin/magic-nix-cache retention-days: 1 + + build-artifacts-ARM64-Linux: + concurrency: build-X64-Linux + runs-on: namespace-profile-default-arm64 + steps: + - uses: actions/checkout@v3 + + - uses: DeterminateSystems/flake-checker-action@main + + - uses: DeterminateSystems/nix-installer-action@main + + # - uses: DeterminateSystems/magic-nix-cache-action@main + + - name: Build package + run: "nix build .# -L --fallback" + + - name: Upload a Build Artifact + uses: actions/upload-artifact@v3.1.2 + with: + # Artifact name + name: magic-nix-cache-ARM64-Linux + path: result/bin/magic-nix-cache + retention-days: 1 From a4cd3fd46c38ddae2bbb4743d151e1c321654f4a Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Mon, 4 Dec 2023 11:24:16 -0500 Subject: [PATCH 2/4] Disable another action until it builds on ARM --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 39f69ce..b5d19ee 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -78,7 +78,7 @@ jobs: steps: - uses: actions/checkout@v3 - - uses: DeterminateSystems/flake-checker-action@main + # - uses: DeterminateSystems/flake-checker-action@main - uses: DeterminateSystems/nix-installer-action@main From 2dc01683d6a54055986e63e278c2399446180649 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Mon, 4 Dec 2023 11:34:09 -0500 Subject: [PATCH 3/4] Publish an ARM64-Linux --- .github/workflows/release-branches.yml | 7 +++++++ .github/workflows/release-prs.yml | 7 +++++++ .github/workflows/release-tags.yml | 7 +++++++ 3 files changed, 21 insertions(+) diff --git a/.github/workflows/release-branches.yml b/.github/workflows/release-branches.yml index bae2276..3adc3dc 100644 --- a/.github/workflows/release-branches.yml +++ b/.github/workflows/release-branches.yml @@ -52,6 +52,13 @@ jobs: - name: Persist the cache binary run: cp ./cache-binary-X64-Linux/magic-nix-cache ./artifacts/magic-nix-cache-X64-Linux + - uses: actions/download-artifact@v3 + with: + name: magic-nix-cache-ARM64-Linux + path: cache-binary-ARM64-Linux + - name: Persist the cache binary + run: cp ./cache-binary-ARM64-Linux/magic-nix-cache ./artifacts/magic-nix-cache-ARM64-Linux + - name: Publish Release (Branch) env: AWS_BUCKET: ${{ secrets.AWS_S3_UPLOAD_BUCKET }} diff --git a/.github/workflows/release-prs.yml b/.github/workflows/release-prs.yml index 6d899a4..513c2e9 100644 --- a/.github/workflows/release-prs.yml +++ b/.github/workflows/release-prs.yml @@ -56,6 +56,13 @@ jobs: - name: Persist the cache binary run: cp ./cache-binary-X64-Linux/magic-nix-cache ./artifacts/magic-nix-cache-X64-Linux + - uses: actions/download-artifact@v3 + with: + name: magic-nix-cache-ARM64-Linux + path: cache-binary-ARM64-Linux + - name: Persist the cache binary + run: cp ./cache-binary-ARM64-Linux/magic-nix-cache ./artifacts/magic-nix-cache-ARM64-Linux + - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v2 with: diff --git a/.github/workflows/release-tags.yml b/.github/workflows/release-tags.yml index 881ef9b..32d65c3 100644 --- a/.github/workflows/release-tags.yml +++ b/.github/workflows/release-tags.yml @@ -45,6 +45,13 @@ jobs: - name: Persist the cache binary run: cp ./cache-binary-X64-Linux/magic-nix-cache ./artifacts/magic-nix-cache-X64-Linux + - uses: actions/download-artifact@v3 + with: + name: magic-nix-cache-ARM64-Linux + path: cache-binary-ARM64-Linux + - name: Persist the cache binary + run: cp ./cache-binary-ARM64-Linux/magic-nix-cache ./artifacts/magic-nix-cache-ARM64-Linux + - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v2 with: From 713fdeafc7e649acb612f3607badae245e3d3fbc Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Mon, 4 Dec 2023 14:29:52 -0500 Subject: [PATCH 4/4] Fix concurrency --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index b5d19ee..1cd24d2 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -73,7 +73,7 @@ jobs: retention-days: 1 build-artifacts-ARM64-Linux: - concurrency: build-X64-Linux + concurrency: build-ARM64-Linux runs-on: namespace-profile-default-arm64 steps: - uses: actions/checkout@v3