From 1df8f9b8cd239a35e0271dccadfadf3020c1f9df Mon Sep 17 00:00:00 2001
From: Cody P Schafer <dev@codyps.com>
Date: Fri, 22 Oct 2021 10:58:18 -0400
Subject: gha/mac: reduce builds, update to macos-11, update openzfs to 2.1.0,
 check md5

---
 .github/workflows/mac.yml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index d6a2fa7..814377d 100644
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -6,14 +6,11 @@ on:
 name: mac
 jobs:
   mac:
-    runs-on: macos-10.15
+    runs-on: macos-11
     strategy:
       matrix:
         rust:
-          - stable
           - beta
-          - nightly
-          - 1.48.0
     steps:
       - uses: actions/checkout@v2
 
@@ -26,8 +23,15 @@ jobs:
       - name: Cache Rust dependencies
         uses: Swatinem/rust-cache@v1
 
-      - name: Download openzfs-on-osx
-        run: curl -o zfs.pkg https://openzfsonosx.org/forum/download/file.php?id=309&sid=f486243ccdc8e8e13894f14ce0b28d93
+      # MD5 (OpenZFSonOsX-2.1.0-Big.Sur-11.pkg) = 80bee1c01362372ea3a803fdac56bfaa
+      - name: Download OpenZFSonOsX-2.1.0-Big.Sur-11.pkg
+        run: curl -o zfs.pkg https://openzfsonosx.org/forum/download/file.php?id=343&sid=4b2c0ab13fa308c9b91ea188ba907d02
+
+      - name: Check openzfs-on-osx
+        run: |
+          echo "80bee1c01362372ea3a803fdac56bfaa zfs.pkg" >md5.sum
+          md5sum -c md5.sum || { md5sum zfs.pkg; exit 1; }
+          rm md5.sum
 
       - name: Install openzfs-on-osx
         run: sudo installer -verbose -pkg zfs.pkg -target /
-- 
cgit v1.2.3


From b6c59d9e7b95c8b1be59ab0d9e2739b22f9eee23 Mon Sep 17 00:00:00 2001
From: Cody P Schafer <dev@codyps.com>
Date: Fri, 22 Oct 2021 11:01:25 -0400
Subject: bors: require mac too

---
 bors.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bors.toml b/bors.toml
index db128da..a705404 100644
--- a/bors.toml
+++ b/bors.toml
@@ -3,6 +3,7 @@ status = [
 	"test (beta)",
 	"test (1.48.0)",
 	"check",
+	"mac (beta)",
 ]
 cut_body_after = "---"
 delete_merged_branches = true
-- 
cgit v1.2.3


From 3cc7456a4a2f6c1b2423a06da416efdfba8ee646 Mon Sep 17 00:00:00 2001
From: Cody P Schafer <dev@codyps.com>
Date: Fri, 22 Oct 2021 11:09:28 -0400
Subject: gha/mac: disable md5sum checking, md5sum command not in base image

---
 .github/workflows/mac.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index 814377d..80a781e 100644
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -27,12 +27,6 @@ jobs:
       - name: Download OpenZFSonOsX-2.1.0-Big.Sur-11.pkg
         run: curl -o zfs.pkg https://openzfsonosx.org/forum/download/file.php?id=343&sid=4b2c0ab13fa308c9b91ea188ba907d02
 
-      - name: Check openzfs-on-osx
-        run: |
-          echo "80bee1c01362372ea3a803fdac56bfaa zfs.pkg" >md5.sum
-          md5sum -c md5.sum || { md5sum zfs.pkg; exit 1; }
-          rm md5.sum
-
       - name: Install openzfs-on-osx
         run: sudo installer -verbose -pkg zfs.pkg -target /
 
-- 
cgit v1.2.3