Skip to content

Commit 595f9da

Browse files
committed
debugging
1 parent a96562e commit 595f9da

File tree

4 files changed

+16
-9
lines changed

4 files changed

+16
-9
lines changed

.github/workflows/haskell.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ jobs:
126126
# https://github.com/IntersectMBO/cardano-cli/blob/0048f119036ffb9eab357b25dcaf7d320362f071/cardano-cli/test/cardano-cli-golden/Test/Golden/Help.hs#L54
127127
if: ${{ matrix.sys.os != 'windows-latest' }}
128128
run: |
129-
NB_UNUSED_GOLDEN_FILES=$(git ls-files -d | wc -l)
129+
NB_UNUSED_GOLDEN_FILES=$(git ls-files -d | wc -l | xargs)
130130
if [[ "$NB_UNUSED_GOLDEN_FILES" != "0" ]]; then
131131
echo -e "⚠️ The following golden files are not used anymore:\n"
132132
git ls-files -d
@@ -138,7 +138,7 @@ jobs:
138138
# We don't run this step on Windows, as explained in the previous step.
139139
if: ${{ matrix.sys.os != 'windows-latest' }}
140140
run: |
141-
NB_MODIFIED_GOLDEN_FILES=$(git ls-files -m | wc -l)
141+
NB_MODIFIED_GOLDEN_FILES=$(git ls-files -m | wc -l | xargs)
142142
if [[ "$NB_MODIFIED_GOLDEN_FILES" != "0" ]]; then
143143
echo -e "💣 The following golden files are not up-to-date:\n"
144144
git ls-files -m
@@ -179,11 +179,11 @@ jobs:
179179
# to restore the original path. Do note that some test might need msys2
180180
# and will silently fail if msys2 is not in path. See the "Run tests" step.
181181
#
182-
# - name: Setup tmate session
183-
# if: ${{ failure() }}
184-
# uses: mxschmitt/action-tmate@v3
185-
# with:
186-
# limit-access-to-actor: true
182+
- name: Setup tmate session
183+
if: ${{ failure() }}
184+
uses: mxschmitt/action-tmate@v3
185+
with:
186+
limit-access-to-actor: true
187187

188188
build-complete:
189189
needs: [build]

cabal.project

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,13 @@ package bitvec
3232
flags: -simd
3333

3434
extra-packages: Cabal
35+
36+
constraints:
37+
-- hourglass and time-hourglass both in dependency tree break musl build
38+
, time-hourglass < 0
39+
-- haskell.nix patch does not work for 1.6.8
40+
, any.crypton-x509-system < 1.6.8
41+
3542
if os(windows)
3643
constraints: time ^>=1.14
3744
allow-newer: *:time

cardano-cli/cardano-cli.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ common project-config
3434
-Wpartial-fields
3535
-Wredundant-constraints
3636

37-
if impl(ghc >= 9.6)
37+
if impl(ghc >=9.6)
3838
ghc-options: -Wunused-packages
3939

4040
common maybe-unix

flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
];
3333

3434
# see flake `variants` below for alternative compilers
35-
defaultCompiler = "ghc984";
35+
defaultCompiler = "ghc9122";
3636
# Used for cross compilation, and so referenced in .github/workflows/release-upload.yml. Adapt the
3737
# latter if you change this value.
3838
crossCompilerVersionUcrt64 = "ghc9122";

0 commit comments

Comments
 (0)