diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-10-22 15:10:00 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-22 15:10:00 +0000 |
| commit | 57cd26405a82e9c06bebd8808ad36051c8ff411c (patch) | |
| tree | 96159a5c498a8b318e4e64e3af6b3647a6a0e83d | |
| parent | f62089d6d9422c177578c004dc863e596e6a3465 (diff) | |
| parent | 3cc7456a4a2f6c1b2423a06da416efdfba8ee646 (diff) | |
| download | rust-libzfs-57cd26405a82e9c06bebd8808ad36051c8ff411c.zip | |
Merge #81
81: gha/mac: reduce builds, update to macos-11, update openzfs to 2.1.0, check md5 r=jmesmon a=jmesmon
Co-authored-by: Cody P Schafer <dev@codyps.com>
| -rw-r--r-- | .github/workflows/mac.yml | 10 | ||||
| -rw-r--r-- | bors.toml | 1 |
2 files changed, 5 insertions, 6 deletions
diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index d6a2fa7..80a781e 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,9 @@ 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: Install openzfs-on-osx run: sudo installer -verbose -pkg zfs.pkg -target / @@ -3,6 +3,7 @@ status = [ "test (beta)", "test (1.48.0)", "check", + "mac (beta)", ] cut_body_after = "---" delete_merged_branches = true |