Skip to content

Commit a5b73a5

Browse files
committed
Merge branch 'ci-9.6.7'
2 parents ad2e6ee + 37b7060 commit a5b73a5

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

.github/workflows/bootstrap.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ jobs:
1515
name: bootstrap
1616
runs-on: ${{ matrix.os }}
1717
env:
18-
BOOTSTRAP_HASKELL_CABAL_VERSION: 3.6.2.0
19-
BOOTSTRAP_HASKELL_GHC_VERSION: 8.10.7
18+
BOOTSTRAP_HASKELL_CABAL_VERSION: 3.12.1.0
19+
BOOTSTRAP_HASKELL_GHC_VERSION: 9.6.7
2020
BOOTSTRAP_HASKELL_NONINTERACTIVE: yes
2121
ARCH: 64
2222
JSON_VERSION: "0.0.7"

.github/workflows/cabal.project.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ jobs:
2020
fail-fast: false
2121
matrix:
2222
os: [macOS-13, windows-latest, ubuntu-latest]
23-
ghc: ["8.10.7", "9.0.2", "9.2.8", "9.4.8", "9.6.6", "9.8.4", "9.10.1"]
23+
ghc: ["8.10.7", "9.0.2", "9.2.8", "9.4.8", "9.6.7", "9.8.4", "9.10.1"]
2424
include:
2525
- os: macOS-latest
2626
ghc: "9.2.8"
2727
- os: macOS-latest
2828
ghc: "9.4.8"
2929
- os: macOS-latest
30-
ghc: "9.6.6"
30+
ghc: "9.6.7"
3131
- os: macOS-latest
3232
ghc: "9.8.4"
3333
- os: macOS-latest

.github/workflows/release.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -146,15 +146,15 @@ jobs:
146146
include:
147147
- os: [self-hosted, macOS, ARM64]
148148
ARTIFACT: "aarch64-apple-darwin-ghcup"
149-
GHC_VER: 9.6.6
149+
GHC_VER: 9.6.7
150150
ARCH: ARM64
151151
- os: macOS-13
152152
ARTIFACT: "x86_64-apple-darwin-ghcup"
153-
GHC_VER: 9.6.6
153+
GHC_VER: 9.6.7
154154
ARCH: 64
155155
- os: windows-latest
156156
ARTIFACT: "x86_64-mingw64-ghcup"
157-
GHC_VER: 9.6.6
157+
GHC_VER: 9.6.7
158158
ARCH: 64
159159
steps:
160160
- name: Checkout code
@@ -230,7 +230,7 @@ jobs:
230230
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
231231
S3_HOST: ${{ secrets.S3_HOST }}
232232
ARTIFACT: "x86_64-portbld-freebsd-ghcup"
233-
GHC_VER: 9.6.6
233+
GHC_VER: 9.6.7
234234
ARCH: 64
235235
DISTRO: na
236236
RUNNER_OS: FreeBSD
@@ -277,12 +277,12 @@ jobs:
277277
DISTRO: Alpine
278278
- os: ubuntu-latest
279279
ARTIFACT: "x86_64-linux-ghcup"
280-
GHC_VER: 9.6.6
280+
GHC_VER: 9.6.7
281281
ARCH: 64
282282
DISTRO: Alpine
283283
- os: ubuntu-latest
284284
ARTIFACT: "x86_64-linux-ghcup"
285-
GHC_VER: 9.6.6
285+
GHC_VER: 9.6.7
286286
ARCH: 64
287287
DISTRO: Ubuntu
288288

@@ -397,17 +397,17 @@ jobs:
397397
include:
398398
- os: [self-hosted, macOS, ARM64]
399399
ARTIFACT: "aarch64-apple-darwin-ghcup"
400-
GHC_VER: 9.6.6
400+
GHC_VER: 9.6.7
401401
ARCH: ARM64
402402
DISTRO: na
403403
- os: macOS-13
404404
ARTIFACT: "x86_64-apple-darwin-ghcup"
405-
GHC_VER: 9.6.6
405+
GHC_VER: 9.6.7
406406
ARCH: 64
407407
DISTRO: na
408408
- os: windows-latest
409409
ARTIFACT: "x86_64-mingw64-ghcup"
410-
GHC_VER: 9.6.6
410+
GHC_VER: 9.6.7
411411
ARCH: 64
412412
DISTRO: na
413413

@@ -472,7 +472,7 @@ jobs:
472472
CABAL_VER: 3.14.1.1
473473
MACOSX_DEPLOYMENT_TARGET: 10.13
474474
ARTIFACT: "x86_64-portbld-freebsd-ghcup"
475-
GHC_VER: 9.6.6
475+
GHC_VER: 9.6.7
476476
ARCH: 64
477477
DISTRO: na
478478
RUNNER_OS: FreeBSD

0 commit comments

Comments
 (0)