Merge pull request #20 from nixbuild/macos-fixes

Add macos-11 and macos-12
nixbuild · Nov 1, 2022 · fc0f6f1 · fc0f6f1
2 parents 7092102 + dd4e539
commit fc0f6f1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        os: [ubuntu-latest, macos-10.15]
+        os: [ubuntu-22.04, macos-12]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
@@ -35,15 +35,15 @@ jobs:
           echo "result=$(readlink result)" >> "$GITHUB_OUTPUT"
       - uses: actions/upload-artifact@v3
         with:
-          name: nix-archives-${{ matrix.os }}
+          name: nix-archives-${{ runner.os }}
           path: ${{ steps.build-nix-archives.outputs.result }}/
 
   test-nix:
     needs: build
     strategy:
       fail-fast: true
       matrix:
-        os: [ubuntu-latest, macos-10.15]
+        os: [ubuntu-latest, macos-10.15, macos-11, macos-12]
         nix_version:
           - 2.11.0
           - 2.10.3
@@ -66,13 +66,17 @@ jobs:
         exclude:
           - os: macos-10.15
             nix_version: 2.0.4
+          - os: macos-11
+            nix_version: 2.0.4
+          - os: macos-12
+            nix_version: 2.0.4
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
       - uses: actions/download-artifact@v3
         id: nix-archives
         with:
-          name: nix-archives-${{ matrix.os }}
+          name: nix-archives-${{ runner.os }}
       - uses: ./
         with:
           nix_archives_url: file://${{steps.nix-archives.outputs.download-path}}
@@ -86,7 +90,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        os: [ubuntu-latest, macos-10.15]
+        os: [ubuntu-latest, macos-10.15, macos-11, macos-12]
         nix_version:
           - 2.11.0
           - 2.10.3
@@ -131,7 +135,7 @@ jobs:
       - uses: actions/download-artifact@v3
         id: nix-archives
         with:
-          name: nix-archives-${{ matrix.os }}
+          name: nix-archives-${{ runner.os }}
       - uses: ./
         with:
           nix_archives_url: file://${{steps.nix-archives.outputs.download-path}}
@@ -164,11 +168,11 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/download-artifact@v3
         with:
-          name: nix-archives-ubuntu-latest
+          name: nix-archives-Linux
           path: /tmp/archives
       - uses: actions/download-artifact@v3
         with:
-          name: nix-archives-macos-10.15
+          name: nix-archives-macOS
           path: /tmp/archives
       - uses: ./
         with:

diff --git a/nix-quick-install.sh b/nix-quick-install.sh
@@ -9,7 +9,9 @@ if [[ $OSTYPE =~ darwin ]]; then
   sudo $SHELL -euo pipefail << EOF
   echo nix >> /etc/synthetic.conf
   echo -e "run\\tprivate/var/run" >> /etc/synthetic.conf
-  /System/Library/Filesystems/apfs.fs/Contents/Resources/apfs.util -B || true
+  /System/Library/Filesystems/apfs.fs/Contents/Resources/apfs.util -B &>/dev/null \
+    || /System/Library/Filesystems/apfs.fs/Contents/Resources/apfs.util -t &>/dev/null \
+    || echo "warning: failed to execute apfs.util"
   diskutil apfs addVolume disk1 APFS nix -mountpoint /nix
   mdutil -i off /nix
   chown $USER /nix