wip: gha test

7mind · Oct 24, 2024 · bb3c3b7 · bb3c3b7
1 parent 647b4d1
commit bb3c3b7
Showing 1 changed file with 38 additions and 33 deletions.
diff --git a/.github/workflows/baboon-build.yml b/.github/workflows/baboon-build.yml
@@ -31,15 +31,20 @@ jobs:
           - target: macos-amd64-13
             os: macos-13 # this is amd64
             runs-on: [ ]
+          - 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
       - name: Install Nix (Linux)
-        if: matrix.preconfigured != true
-        uses: nixbuild/nix-quick-install-action@v28
+#        if: matrix.preconfigured != true
+#        uses: nixbuild/nix-quick-install-action@v28
+      - name: Install Nix
+        uses: DeterminateSystems/nix-installer-action@main
       - name: Restore and cache Nix store
         uses: nix-community/cache-nix-action@v5
         if: matrix.preconfigured != true
@@ -60,36 +65,36 @@ 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/**
+#  # 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:
@@ -128,7 +133,7 @@ jobs:
       - ubuntu-latest
     needs:
       - build-unix
-      - build-mac-arm
+#      - build-mac-arm
       - build-windows
     steps:
       - uses: actions/checkout@v4