Merge pull request #5006 from input-output-hk/newhoggy/upgrade-to-cab…

…al-3.10.1.0 Upgrade to cabal-3.10.1.0
IntersectMBO · Mar 21, 2023 · c83b479 · c83b479
2 parents 7f52046 + bb4b1c9
commit c83b479
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/check-cabal-files.yml b/.github/workflows/check-cabal-files.yml
@@ -18,7 +18,7 @@ jobs:
       uses: input-output-hk/setup-haskell@v1
       id: setup-haskell
       with:
-        cabal-version: "3.8.1.0"
+        cabal-version: "3.10.1.0"
 
     - uses: actions/checkout@v3
 

diff --git a/.github/workflows/github-page.yml b/.github/workflows/github-page.yml
@@ -17,7 +17,7 @@ jobs:
       fail-fast: false
       matrix:
         ghc: ["9.2.7"]
-        cabal: ["3.8.1.0"]
+        cabal: ["3.10.1.0"]
         os: [ubuntu-latest]
 
     env:
@@ -87,7 +87,7 @@ jobs:
         dist-dir: dist-newstyle
         store-path: ${{ steps.cabal-store.outputs.cabal-store }}
         threads: 16
-        archive-uri: ${{ secrets.BINARY_CACHE_URI }}/${{ env.CABAL_CACHE_VERSION }}/${{ runner.os }}
+        archive-uri: ${{ secrets.BINARY_CACHE_URI }}/${{ env.CABAL_CACHE_VERSION }}/${{ runner.os }}/${{ matrix.cabal }}/${{ matrix.ghc }}
         skip: "${{ secrets.BINARY_CACHE_URI == '' }}"
 
     - name: Cabal cache over HTTPS
@@ -96,7 +96,7 @@ jobs:
         dist-dir: dist-newstyle
         store-path: ${{ steps.cabal-store.outputs.cabal-store }}
         threads: 16
-        archive-uri: https://iohk.cache.haskellworks.io/${{ env.CABAL_CACHE_VERSION }}/${{ runner.os }}
+        archive-uri: https://iohk.cache.haskellworks.io/${{ env.CABAL_CACHE_VERSION }}/${{ runner.os }}/${{ matrix.cabal }}/${{ matrix.ghc }}
         skip: "${{ secrets.BINARY_CACHE_URI != '' }}"
         enable-save: false
 

diff --git a/.github/workflows/haskell-linux.yml b/.github/workflows/haskell-linux.yml
@@ -11,8 +11,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ["8.10.7", "9.2.7" ]
-        cabal: ["3.8.1.0"]
+        ghc: ["8.10.7", "9.2.7"]
+        cabal: ["3.10.1.0"]
         os: [ubuntu-latest]
 
     env:
@@ -111,7 +111,7 @@ jobs:
         dist-dir: dist-newstyle
         store-path: ${{ steps.setup-haskell.outputs.cabal-store }}
         threads: 16
-        archive-uri: ${{ secrets.BINARY_CACHE_URI }}/${{ env.CABAL_CACHE_VERSION }}/${{ runner.os }}
+        archive-uri: ${{ secrets.BINARY_CACHE_URI }}/${{ env.CABAL_CACHE_VERSION }}/${{ runner.os }}/${{ matrix.cabal }}/${{ matrix.ghc }}
         skip: "${{ secrets.BINARY_CACHE_URI == '' }}"
 
     # It's important to ensure that people who fork this repository can not only successfully build in
@@ -129,7 +129,7 @@ jobs:
         dist-dir: dist-newstyle
         store-path: ${{ steps.setup-haskell.outputs.cabal-store }}
         threads: 16
-        archive-uri: https://iohk.cache.haskellworks.io/${{ env.CABAL_CACHE_VERSION }}/${{ runner.os }}
+        archive-uri: https://iohk.cache.haskellworks.io/${{ env.CABAL_CACHE_VERSION }}/${{ runner.os }}/${{ matrix.cabal }}/${{ matrix.ghc }}
         skip: "${{ secrets.BINARY_CACHE_URI != '' }}"
         enable-save: false
 

diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
@@ -12,7 +12,7 @@ jobs:
       fail-fast: false
       matrix:
         ghc: ["9.2.7"]
-        cabal: ["3.8.1.0"]
+        cabal: ["3.10.1.0"]
         os: [macos-latest, windows-latest]
 
     env:
@@ -126,7 +126,7 @@ jobs:
         dist-dir: dist-newstyle
         store-path: ${{ steps.setup-haskell.outputs.cabal-store }}
         threads: 16
-        archive-uri: ${{ secrets.BINARY_CACHE_URI }}/${{ env.CABAL_CACHE_VERSION }}/${{ runner.os }}
+        archive-uri: ${{ secrets.BINARY_CACHE_URI }}/${{ env.CABAL_CACHE_VERSION }}/${{ runner.os }}/${{ matrix.cabal }}/${{ matrix.ghc }}
         skip: "${{ secrets.BINARY_CACHE_URI == '' }}"
 
     # It's important to ensure that people who fork this repository can not only successfully build in
@@ -144,7 +144,7 @@ jobs:
         dist-dir: dist-newstyle
         store-path: ${{ steps.setup-haskell.outputs.cabal-store }}
         threads: 16
-        archive-uri: https://iohk.cache.haskellworks.io/${{ env.CABAL_CACHE_VERSION }}/${{ runner.os }}
+        archive-uri: https://iohk.cache.haskellworks.io/${{ env.CABAL_CACHE_VERSION }}/${{ runner.os }}/${{ matrix.cabal }}/${{ matrix.ghc }}
         skip: "${{ secrets.BINARY_CACHE_URI != '' }}"
         enable-save: false