Skip to content

Commit a8becda

Browse files
committed
Update cabal before freeze
1 parent d42b728 commit a8becda

File tree

3 files changed

+9
-11
lines changed

3 files changed

+9
-11
lines changed

.github/workflows/bench.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,9 @@ jobs:
8585
INDEX_STATE1=$(echo "$INDEX_STATE_ENTRY" | cut -d' ' -f2 | tr ':' '-')
8686
echo "INDEX_STATE=$INDEX_STATE1" >> $GITHUB_ENV
8787
88+
# To ensure we get the lastest hackage index and not relying on haskell action logic
89+
- run: cabal update
90+
8891
- name: Form the package list ('cabal.project.freeze')
8992
id: compute-cache-key
9093
run: |
@@ -121,9 +124,6 @@ jobs:
121124
${{ env.cache-name }}-${{ runner.os }}-${{ matrix.ghc }}-
122125
${{ env.cache-name }}-${{ runner.os }}-
123126
124-
# To ensure we get the lastest hackage index and not relying on haskell action logic
125-
- run: cabal update
126-
127127
# max-backjumps is increased as a temporary solution
128128
# for dependency resolution failure
129129
- run: cabal configure --enable-benchmarks --max-backjumps 12000

.github/workflows/caching.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,9 @@ jobs:
142142
INDEX_STATE1=$(echo "$INDEX_STATE_ENTRY" | cut -d' ' -f2 | tr ':' '-')
143143
echo "INDEX_STATE=$INDEX_STATE1" >> $GITHUB_ENV
144144
145+
# To ensure we get the lastest hackage index and not relying on haskell action logic
146+
- run: cabal update
147+
145148
- name: Form the package list ('cabal.project.freeze')
146149
id: compute-cache-key
147150
run: |
@@ -183,10 +186,6 @@ jobs:
183186
${{ env.cache-name }}-${{ runner.os }}-${{ matrix.ghc }}-
184187
${{ env.cache-name }}-${{ runner.os }}-
185188
186-
# To ensure we get the lastest hackage index and not relying on haskell action logic
187-
- if: steps.compiled-deps.outputs.cache-hit != 'true'
188-
run: cabal update
189-
190189
- if: steps.compiled-deps.outputs.cache-hit != 'true' && runner.os == 'Linux' && matrix.ghc == '8.10.7'
191190
name: Download sources for bench
192191
# Downloaded separately, to match the tested work/PR workflow guarantees

.github/workflows/test.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,9 @@ jobs:
146146
INDEX_STATE1=$(echo "$INDEX_STATE_ENTRY" | cut -d' ' -f2 | tr ':' '-')
147147
echo "INDEX_STATE=$INDEX_STATE1" >> $GITHUB_ENV
148148
149+
# To ensure we get the lastest hackage index and not relying on haskell action logic
150+
- run: cabal update
151+
149152
- name: Compute the cache key
150153
id: compute-cache-key
151154
run: |
@@ -182,10 +185,6 @@ jobs:
182185
${{ env.cache-name }}-${{ runner.os }}-${{ matrix.ghc }}-
183186
${{ env.cache-name }}-${{ runner.os }}-
184187
185-
# To ensure we get the lastest hackage index and not relying on haskell action logic
186-
- if: steps.compiled-deps.outputs.cache-hit != 'true'
187-
run: cabal update
188-
189188
# repeating builds to workaround segfaults in windows and ghc-8.8.4
190189
- name: Build
191190
run: cabal build || cabal build || cabal build

0 commit comments

Comments
 (0)