Skip to content

Commit bf5f5da

Browse files
authored
Attempt to fix CI again (#626)
The windows jobs were subtly broken by #613, which caused the build products to live in bytestring-*/dist-newstyle instead of dist-newstyle. This didn't appear to break immediately because we restored cached stuff in dist-newstyle including stale executables. It wasn't until a week of inactivity caused our cache to expire that the breakage became appropriately obvious. I don't really understand what went wrong with the centos job; I just borrowed the workaround from haskell/text#541.
1 parent 1b9e6ec commit bf5f5da

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
branches:
55
- master
66
- bytestring-0.11
7+
- bytestring-0.12
78
pull_request: {} # Validate all PRs
89

910
defaults:
@@ -17,7 +18,7 @@ jobs:
1718
fail-fast: true
1819
matrix:
1920
os: [ubuntu-latest]
20-
ghc: ['8.0', '8.2', '8.4', '8.6', '8.8', '8.10', '9.0', '9.2', '9.4', '9.6']
21+
ghc: ['8.0', '8.2', '8.4', '8.6', '8.8', '8.10', '9.0', '9.2', '9.4', '9.6', '9.8']
2122
include:
2223
- os: macOS-latest
2324
ghc: 'latest'
@@ -33,7 +34,7 @@ jobs:
3334
ghc-version: ${{ matrix.ghc }}
3435
- name: Update cabal package database
3536
run: cabal update
36-
- uses: actions/cache@v2
37+
- uses: actions/cache@v3
3738
name: Cache cabal stuff
3839
with:
3940
path: |
@@ -75,7 +76,7 @@ jobs:
7576
ghc-version: ${{ matrix.ghc }}
7677
- name: Update cabal package database
7778
run: cabal update
78-
- uses: actions/cache@v2
79+
- uses: actions/cache@v3
7980
name: Cache cabal stuff
8081
with:
8182
path: |
@@ -97,6 +98,7 @@ jobs:
9798
- name: Run Test
9899
# test broken linking on windows: https://github.com/haskell/bytestring/issues/497
99100
run: |
101+
cd bytestring-*/
100102
$bin = cabal list-bin bytestring-tests
101103
$env:PATH = ''
102104
& "$bin"
@@ -155,7 +157,7 @@ jobs:
155157
ghc-version: 'latest'
156158
- name: Update cabal package database
157159
run: cabal update
158-
- uses: actions/cache@v2
160+
- uses: actions/cache@v3
159161
name: Cache cabal stuff
160162
with:
161163
path: |
@@ -174,7 +176,7 @@ jobs:
174176
- name: install deps
175177
run: |
176178
yum install -y gcc gmp gmp-devel make ncurses ncurses-compat-libs xz perl
177-
curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 sh
179+
curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_GHC_VERSION=9.2.8 sh
178180
- uses: actions/checkout@v3
179181
- name: test
180182
run: |

0 commit comments

Comments
 (0)