Skip to content

Commit 1697b3a

Browse files
authored
Merge pull request #5625 from IntersectMBO/origin/newhoggy/update-index-state-1
Update index state
2 parents 76ef0fe + 9aefc31 commit 1697b3a

File tree

3 files changed

+17
-6
lines changed

3 files changed

+17
-6
lines changed

.github/workflows/haskell.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ jobs:
2626
fail-fast: false
2727
matrix:
2828
ghc: ["9.2.8", "9.6.3"]
29-
cabal: ["3.10.2.0"]
29+
cabal: ["3.10.2.1"]
3030
os: [macos-latest, windows-latest, ubuntu-latest]
3131

3232
env:
3333
# Modify this value to "invalidate" the cabal cache.
34-
CABAL_CACHE_VERSION: "2023-12-15"
34+
CABAL_CACHE_VERSION: "2024-10-05-b"
3535

3636
concurrency:
3737
group: >
@@ -123,6 +123,17 @@ jobs:
123123
skip: "${{ vars.BINARY_CACHE_URI != '' }}"
124124
enable-save: false
125125

126+
# The following seems like a duplicate but it is due to a bug in cabal which can sometimes
127+
# cause build intermittent build failures on Windows, so we run the build twice.
128+
#
129+
# https://github.com/haskell/cabal/issues/9587
130+
#
131+
# TODO Remove the workaround when the cabal bug is fixed.
132+
- name: Build core components
133+
continue-on-error: true
134+
run: |
135+
cabal build cardano-node cardano-cli cardano-node-chairman cardano-submit-api -j1
136+
126137
- name: Build core components
127138
run: |
128139
cabal build cardano-node cardano-cli cardano-node-chairman cardano-submit-api -j1

cabal.project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ repository cardano-haskell-packages
1313
-- See CONTRIBUTING for information about these, including some Nix commands
1414
-- you need to run if you change them
1515
index-state:
16-
, hackage.haskell.org 2023-11-20T23:52:53Z
16+
, hackage.haskell.org 2024-01-04T09:36:23Z
1717
, cardano-haskell-packages 2023-12-15T14:50:31Z
1818

1919
packages:

flake.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)