From 759cc0b053188a6b143dd51abd68b6b78b4046a4 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Mon, 4 Dec 2023 11:04:15 -0500 Subject: [PATCH 1/9] 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/9] 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/9] 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/9] 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 From dde3e150500e9bbc70025cd443b88ce44a313505 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Mon, 4 Dec 2023 14:58:46 -0500 Subject: [PATCH 5/9] release 0.1.2 --- Cargo.lock | 2 +- magic-nix-cache/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 03992b7..a78df5a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -701,7 +701,7 @@ dependencies = [ [[package]] name = "magic-nix-cache" -version = "0.1.1" +version = "0.1.2" dependencies = [ "axum", "axum-macros", diff --git a/magic-nix-cache/Cargo.toml b/magic-nix-cache/Cargo.toml index 989880d..3fa9392 100644 --- a/magic-nix-cache/Cargo.toml +++ b/magic-nix-cache/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "magic-nix-cache" -version = "0.1.1" +version = "0.1.2" edition = "2021" license = "Apache-2.0" From cb1016de6ff40973c3b43eb654ad761c23d749be Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Mon, 4 Dec 2023 15:54:59 -0500 Subject: [PATCH 6/9] Restore the magic nix cache and flake check actions to aarch64 linux --- .github/workflows/build.yaml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 1cd24d2..155a96e 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -6,7 +6,6 @@ on: jobs: build-artifacts-ARM64-macOS: - concurrency: build-ARM64-macOS runs-on: macos-latest-xlarge steps: - uses: actions/checkout@v3 @@ -27,7 +26,6 @@ jobs: retention-days: 1 build-artifacts-X64-macOS: - concurrency: build-X64-macOS runs-on: macos-12 steps: - uses: actions/checkout@v3 @@ -50,7 +48,6 @@ jobs: retention-days: 1 build-artifacts-X64-Linux: - concurrency: build-X64-Linux runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 @@ -73,16 +70,15 @@ jobs: retention-days: 1 build-artifacts-ARM64-Linux: - concurrency: build-ARM64-Linux runs-on: namespace-profile-default-arm64 steps: - uses: actions/checkout@v3 - # - uses: DeterminateSystems/flake-checker-action@main + - uses: DeterminateSystems/flake-checker-action@main - uses: DeterminateSystems/nix-installer-action@main - # - uses: DeterminateSystems/magic-nix-cache-action@main + - uses: DeterminateSystems/magic-nix-cache-action@main - name: Build package run: "nix build .# -L --fallback" From 6fda83104b22222c6974d02f332bbaffb24cfbcd Mon Sep 17 00:00:00 2001 From: Ana Hobden Date: Tue, 19 Dec 2023 10:58:10 -0800 Subject: [PATCH 7/9] Update some dependencies --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a78df5a..cddf35d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1039,9 +1039,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.20" +version = "0.37.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" dependencies = [ "bitflags 1.3.2", "errno", @@ -1086,9 +1086,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.100.1" +version = "0.100.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +checksum = "5f6a5fc258f1c1276dfe3016516945546e2d5383911efc0fc4f1cdc5df3a4ae3" dependencies = [ "ring", "untrusted", From b9f40af3419822239b741599292fa793209ee54c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 31 Jan 2024 15:44:33 +0000 Subject: [PATCH 8/9] Bump h2 from 0.3.19 to 0.3.24 Bumps [h2](https://github.com/hyperium/h2) from 0.3.19 to 0.3.24. - [Release notes](https://github.com/hyperium/h2/releases) - [Changelog](https://github.com/hyperium/h2/blob/v0.3.24/CHANGELOG.md) - [Commits](https://github.com/hyperium/h2/compare/v0.3.19...v0.3.24) --- updated-dependencies: - dependency-name: h2 dependency-type: indirect ... Signed-off-by: dependabot[bot] --- Cargo.lock | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cddf35d..57ac0d2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -275,6 +275,12 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + [[package]] name = "errno" version = "0.3.1" @@ -431,9 +437,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.19" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" +checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" dependencies = [ "bytes", "fnv", @@ -450,9 +456,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.12.3" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "heck" @@ -592,11 +598,11 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.3" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +checksum = "433de089bd45971eecf4668ee0ee8f4cec17db4f8bd8f7bc3197a6ce37aa7d9b" dependencies = [ - "autocfg", + "equivalent", "hashbrown", ] From 448ba4242953bc72f597f5b0716037d759fad26d Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Sun, 25 Feb 2024 15:25:09 -0500 Subject: [PATCH 9/9] Correct privacy policy link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d21fec3..13b6182 100644 --- a/README.md +++ b/README.md @@ -119,7 +119,7 @@ You can read the full privacy policy for [Determinate Systems][detsys], the crea [action]: https://github.com/DeterminateSystems/magic-nix-cache-action/ [installer]: https://github.com/DeterminateSystems/nix-installer/ [ghacache]: https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows -[privacy]: https://determinate.systems/privacy +[privacy]: https://determinate.systems/policies/privacy [telemetry]: https://github.com/DeterminateSystems/magic-nix-cache/blob/main/magic-nix-cache/src/telemetry.rs [semantics]: https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#restrictions-for-accessing-a-cache [z2ncache]: https://zero-to-nix.com/concepts/caching#binary-caches