wip: gha test

7mind · Oct 24, 2024 · ab63d61 · ab63d61
1 parent d7268c3
commit ab63d61
Showing 1 changed file with 11 additions and 46 deletions.
diff --git a/.github/workflows/baboon-build.yml b/.github/workflows/baboon-build.yml
@@ -40,23 +40,20 @@ jobs:
       - ${{ matrix.runs-on }}
     steps:
       - uses: actions/checkout@v4
-#      - name: Install Nix (Linux)
-#        if: matrix.preconfigured != true
-#        uses: nixbuild/nix-quick-install-action@v28
       - name: Install Nix
         if: matrix.preconfigured != true
         uses: DeterminateSystems/nix-installer-action@main
-#      - name: Restore and cache Nix store
-#        uses: nix-community/cache-nix-action@v5
-#        if: matrix.preconfigured != true
-#        with:
-#          primary-key: nix-${{ matrix.target }}-${{ hashFiles('**/*.nix') }}
-#          restore-prefixes-first-match: nix-${{ matrix.target }}-
-#          gc-max-store-size-linux: 1073741824
-#          purge: true
-#          purge-prefixes: cache-${{ matrix.target }}-
-#          purge-created: 0
-#          purge-primary-key: never
+      - name: Restore and cache Nix store
+        uses: nix-community/cache-nix-action@v5
+        if: matrix.preconfigured != true
+        with:
+          primary-key: nix-${{ matrix.target }}-${{ hashFiles('**/*.nix') }}
+          restore-prefixes-first-match: nix-${{ matrix.target }}-
+          gc-max-store-size-linux: 1073741824
+          purge: true
+          purge-prefixes: cache-${{ matrix.target }}-
+          purge-created: 0
+          purge-primary-key: never
       - name: Build
         run: |
           ./nix-rebuild.sh
@@ -66,37 +63,6 @@ jobs:
           path: |
             target/graalvm-native-image/**
 
-#  # nix-quick-install is broken on aarch64 mac agents: https://github.com/nixbuild/nix-quick-install-action/issues/43
-#  build-mac-arm:
-#    strategy:
-#      fail-fast: false
-#      matrix:
-#        include:
-#          - target: macos-aarch64-14
-#            runs-on: [ ]
-#            os: macos-14 # yes, this is aarch64
-#    name: ${{ matrix.target }}
-#    runs-on:
-#      - ${{ matrix.os }}
-#      - ${{ matrix.runs-on }}
-#    steps:
-#      - uses: actions/checkout@v4
-##      - uses: nixbuild/nix-quick-install-action@v28
-##      - run: nix build --version
-#      - name: Install Nix (Mac)
-#        if: matrix.preconfigured != true
-#        uses: cachix/install-nix-action@v27
-#        with:
-#          nix_path: nixpkgs=channel:nixos-unstable
-#      - name: Build (Mac)
-#        run: |
-#          ./nix-rebuild.sh
-#      - uses: actions/upload-artifact@v4
-#        with:
-#          name: baboon-${{ matrix.target }}
-#          path: |
-#            target/graalvm-native-image/**
-
   build-windows:
     strategy:
       fail-fast: false
@@ -134,7 +100,6 @@ jobs:
       - ubuntu-latest
     needs:
       - build-unix
-#      - build-mac-arm
       - build-windows
     steps:
       - uses: actions/checkout@v4