Skip to content

Commit 02db7eb

Browse files
committed
Merge branch 'ci93' into wip/0.1.40.0
2 parents 2f92839 + 54e171f commit 02db7eb

File tree

1 file changed

+11
-29
lines changed

1 file changed

+11
-29
lines changed

.github/workflows/release.yaml

Lines changed: 11 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
name: Build linux binary
2222
runs-on: ${{ matrix.os }}
2323
env:
24-
CABAL_VER: 3.10.3.0
24+
CABAL_VER: 3.12.1.0
2525
JSON_VERSION: "0.0.8"
2626
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
2727
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -85,13 +85,12 @@ jobs:
8585
name: Build ARM binary
8686
runs-on: ${{ matrix.os }}
8787
env:
88-
CABAL_VER: 3.10.3.0
88+
CABAL_VER: 3.12.1.0
8989
JSON_VERSION: "0.0.8"
9090
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
9191
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
9292
S3_HOST: ${{ secrets.S3_HOST }}
9393
strategy:
94-
fail-fast: true
9594
matrix:
9695
include:
9796
- os: [self-hosted, Linux, ARM64, maerwald]
@@ -101,11 +100,6 @@ jobs:
101100
DISTRO: Debian
102101
- os: [self-hosted, Linux, ARM64, maerwald]
103102
ARTIFACT: "aarch64-linux-ghcup"
104-
GHC_VER: 9.6.6
105-
ARCH: ARM64
106-
DISTRO: Debian
107-
- os: [self-hosted, Linux, ARM64, maerwald]
108-
ARTIFACT: "aarch64-linux-alpine-ghcup"
109103
GHC_VER: 9.8.4
110104
ARCH: ARM64
111105
DISTRO: Alpine
@@ -125,6 +119,7 @@ jobs:
125119
name: Run build (armv7 linux)
126120
with:
127121
args: sh .github/scripts/build.sh
122+
network: host
128123
env:
129124
ARTIFACT: ${{ matrix.ARTIFACT }}
130125
ARCH: ${{ matrix.ARCH }}
@@ -135,25 +130,12 @@ jobs:
135130
S3_HOST: ${{ env.S3_HOST }}
136131
LD: ld.gold
137132

138-
- if: matrix.ARCH == 'ARM64' && matrix.DISTRO == 'Debian'
139-
uses: docker://hasufell/arm64v8-debian-haskell:10
140-
name: Run build (aarch64 linux)
141-
with:
142-
args: sh .github/scripts/build.sh
143-
env:
144-
ARTIFACT: ${{ matrix.ARTIFACT }}
145-
ARCH: ${{ matrix.ARCH }}
146-
GHC_VER: ${{ matrix.GHC_VER }}
147-
DISTRO: ${{ matrix.DISTRO }}
148-
AWS_SECRET_ACCESS_KEY: ${{ env.AWS_SECRET_ACCESS_KEY }}
149-
AWS_ACCESS_KEY_ID: ${{ env.AWS_ACCESS_KEY_ID }}
150-
S3_HOST: ${{ env.S3_HOST }}
151-
152-
- if: matrix.ARCH == 'ARM64' && matrix.DISTRO == 'Alpine'
133+
- if: matrix.ARCH == 'ARM64'
153134
uses: docker://hasufell/arm64v8-alpine-haskell:3.20
154135
name: Run build (aarch64 linux)
155136
with:
156137
args: sh -c ".github/scripts/build.sh '--ghc-options=-split-sections' '--enable-executable-static'"
138+
network: host
157139
env:
158140
ARTIFACT: ${{ matrix.ARTIFACT }}
159141
ARCH: ${{ matrix.ARCH }}
@@ -175,7 +157,7 @@ jobs:
175157
name: Build binary (Mac/Win)
176158
runs-on: ${{ matrix.os }}
177159
env:
178-
CABAL_VER: 3.10.3.0
160+
CABAL_VER: 3.12.1.0
179161
MACOSX_DEPLOYMENT_TARGET: 10.13
180162
JSON_VERSION: "0.0.8"
181163
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -266,7 +248,7 @@ jobs:
266248
name: Build binary (FreeBSD)
267249
runs-on: [self-hosted, FreeBSD, X64]
268250
env:
269-
CABAL_VER: 3.10.3.0
251+
CABAL_VER: 3.12.1.0
270252
MACOSX_DEPLOYMENT_TARGET: 10.13
271253
JSON_VERSION: "0.0.8"
272254
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -309,7 +291,7 @@ jobs:
309291
needs: "build-linux"
310292
runs-on: ${{ matrix.os }}
311293
env:
312-
CABAL_VER: 3.10.3.0
294+
CABAL_VER: 3.12.1.0
313295
JSON_VERSION: "0.0.8"
314296
strategy:
315297
matrix:
@@ -387,7 +369,7 @@ jobs:
387369
needs: "build-arm"
388370
runs-on: ${{ matrix.os }}
389371
env:
390-
CABAL_VER: 3.10.3.0
372+
CABAL_VER: 3.12.1.0
391373
JSON_VERSION: "0.0.8"
392374
strategy:
393375
matrix:
@@ -466,7 +448,7 @@ jobs:
466448
needs: "build-macwin"
467449
runs-on: ${{ matrix.os }}
468450
env:
469-
CABAL_VER: 3.10.3.0
451+
CABAL_VER: 3.12.1.0
470452
MACOSX_DEPLOYMENT_TARGET: 10.13
471453
JSON_VERSION: "0.0.8"
472454
strategy:
@@ -545,7 +527,7 @@ jobs:
545527
needs: "build-freebsd"
546528
runs-on: [self-hosted, FreeBSD, X64]
547529
env:
548-
CABAL_VER: 3.10.3.0
530+
CABAL_VER: 3.12.1.0
549531
MACOSX_DEPLOYMENT_TARGET: 10.13
550532
JSON_VERSION: "0.0.8"
551533
ARTIFACT: "x86_64-portbld-freebsd-ghcup"

0 commit comments

Comments
 (0)