Skip to content

Commit 6481b9b

Browse files
authored
Merge pull request #185 from token-dynamics/fix-ci-2
Fix CI
2 parents 4f3816c + dd6640f commit 6481b9b

File tree

1 file changed

+4
-31
lines changed

1 file changed

+4
-31
lines changed

.github/workflows/haskell.yml

Lines changed: 4 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -45,21 +45,10 @@ jobs:
4545
- name: Configure project
4646
run: cabal configure --enable-tests --enable-benchmarks --write-ghc-environment-files=ghc8.4.4+
4747

48-
- name: Restore cabal cache
49-
uses: haskell-works/cabal-cache-action@v1
50-
env:
51-
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
52-
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
53-
BINARY_CACHE_REGION: ${{ secrets.BINARY_CACHE_REGION }}
54-
BINARY_CACHE_THREADS: ${{ secrets.BINARY_CACHE_THREADS }}
55-
BINARY_CACHE_URI: ${{ secrets.BINARY_CACHE_URI }}
48+
- uses: action-works/cabal-cache@v1
49+
name: Cache cabal store
5650
with:
57-
args: |
58-
sync-from-archive \
59-
--threads "${BINARY_CACHE_THREADS-4}" \
60-
--archive-uri "${BINARY_CACHE_URI-'http://hw-binary-cache-us-west-2-a.s3-website-us-west-2.amazonaws.com/archive'}" \
61-
--region "${BINARY_CACHE_REGION-'us-west-2'}" \
62-
--store-path "${{ steps.setup-haskell.outputs.cabal-store }}"
51+
key-prefix: CwBTpnRd
6352

6453
- name: Build
6554
# Try building it twice in case of flakey builds on Windows
@@ -71,23 +60,6 @@ jobs:
7160
run: |
7261
cabal test all --enable-tests --enable-benchmarks --write-ghc-environment-files=ghc8.4.4+
7362
74-
- name: Save cabal cache
75-
uses: haskell-works/cabal-cache-action@v1
76-
if: ${{ always() }}
77-
env:
78-
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
79-
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
80-
BINARY_CACHE_REGION: ${{ secrets.BINARY_CACHE_REGION }}
81-
BINARY_CACHE_THREADS: ${{ secrets.BINARY_CACHE_THREADS }}
82-
BINARY_CACHE_URI: ${{ secrets.BINARY_CACHE_URI }}
83-
with:
84-
args: |
85-
sync-to-archive \
86-
--threads "${BINARY_CACHE_THREADS-4}" \
87-
--archive-uri "${BINARY_CACHE_URI-'http://hw-binary-cache-us-west-2-a.s3-website-us-west-2.amazonaws.com/archive'}" \
88-
--region "${BINARY_CACHE_REGION-'us-west-2'}" \
89-
--store-path "${{ steps.setup-haskell.outputs.cabal-store }}"
90-
9163
check:
9264
needs: build
9365
runs-on: ubuntu-latest
@@ -192,3 +164,4 @@ jobs:
192164
body: Undocumented
193165
draft: true
194166
prerelease: false
167+

0 commit comments

Comments
 (0)