Merge #1973

1973: MacOS chairman in GitHub actions r=newhoggy a=newhoggy Co-authored-by: John Ky <john.ky@iohk.io>
IntersectMBO · Oct 13, 2020 · a7463a1 · a7463a1
2 parents 4f44b01 + daf165b
commit a7463a1
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         ghc: ["8.6.5"]
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest, macos-latest, windows-latest]
 
     steps:
     - uses: actions/checkout@v1
@@ -41,6 +41,10 @@ jobs:
         echo "LIBSODIUM_PATH=$LIBSODIUM_PATH"
         echo "$LIBSODIUM_PATH" >> $GITHUB_PATH
 
+    - name: Install libsodium
+      if: matrix.os == 'macos-latest'
+      run: brew install libsodium
+
     - name: Configure to use libsodium
       run: |
         cat >> cabal.project <<EOF
@@ -75,9 +79,8 @@ jobs:
         path: |
           ${{ steps.setup-haskell.outputs.cabal-store }}
           dist
-        key: cache-${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles('cabal-cache.cabal') }}-${{ github.sha }}
-        restore-keys: |
-          cache-${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles('cabal-cache.cabal') }}-
+        key: cache-${{ runner.os }}-${{ matrix.ghc }}-v1-${{ hashFiles('cabal-cache.cabal') }}-${{ github.sha }}
+        restore-keys: cache-${{ runner.os }}-${{ matrix.ghc }}-v1-${{ hashFiles('cabal-cache.cabal') }}-
 
     - name: Install dependencies
       run: cabal build all --builddir="$CABAL_BUILDDIR" --only-dependencies