Skip to content

Commit 672801e

Browse files
committed
Wibble
1 parent b9c17d5 commit 672801e

1 file changed

Lines changed: 2 additions & 40 deletions

File tree

.github/workflows/release.yaml

Lines changed: 2 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,14 @@ env:
1616
CABAL_CACHE_DISABLE: ${{ vars.CABAL_CACHE_DISABLE }}
1717
CABAL_CACHE_NONFATAL: yes
1818
JSON_VERSION: "0.0.9"
19-
GHC_VER_DEFAULT: 9.6.7
20-
CABAL_VER_DEFAULT: 3.14.2.0
19+
GHC_VER: 9.6.7
20+
CABAL_VER: 3.14.2.0
2121

2222
jobs:
2323
build-linux:
2424
name: Build linux binary
2525
runs-on: ${{ matrix.os }}
2626
env:
27-
CABAL_VER: ${{ env.CABAL_VER_DEFAULT }}
2827
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
2928
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
3029
S3_HOST: ${{ secrets.S3_HOST }}
@@ -38,7 +37,6 @@ jobs:
3837
ARCH: 32
3938
- os: ubuntu-latest
4039
ARTIFACT: "x86_64-linux-ghcup"
41-
GHC_VER: ${{ env.GHC_VER_DEFAULT }}
4240
ARCH: 64
4341
steps:
4442
- name: Checkout code
@@ -68,7 +66,6 @@ jobs:
6866
env:
6967
ARTIFACT: ${{ matrix.ARTIFACT }}
7068
ARCH: ${{ matrix.ARCH }}
71-
GHC_VER: ${{ matrix.GHC_VER }}
7269
DISTRO: Alpine
7370
AWS_SECRET_ACCESS_KEY: ${{ env.AWS_SECRET_ACCESS_KEY }}
7471
AWS_ACCESS_KEY_ID: ${{ env.AWS_ACCESS_KEY_ID }}
@@ -87,7 +84,6 @@ jobs:
8784
name: Build ARM binary
8885
runs-on: ${{ matrix.os }}
8986
env:
90-
CABAL_VER: ${{ env.CABAL_VER_DEFAULT }}
9187
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
9288
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
9389
S3_HOST: ${{ secrets.S3_HOST }}
@@ -96,7 +92,6 @@ jobs:
9692
include:
9793
- os: [self-hosted, Linux, ARM64, maerwald]
9894
ARTIFACT: "aarch64-linux-ghcup"
99-
GHC_VER: ${{ env.GHC_VER_DEFAULT }}
10095
ARCH: ARM64
10196
DISTRO: Alpine
10297
steps:
@@ -118,7 +113,6 @@ jobs:
118113
env:
119114
ARTIFACT: ${{ matrix.ARTIFACT }}
120115
ARCH: ${{ matrix.ARCH }}
121-
GHC_VER: ${{ matrix.GHC_VER }}
122116
DISTRO: ${{ matrix.DISTRO }}
123117
AWS_SECRET_ACCESS_KEY: ${{ env.AWS_SECRET_ACCESS_KEY }}
124118
AWS_ACCESS_KEY_ID: ${{ env.AWS_ACCESS_KEY_ID }}
@@ -136,7 +130,6 @@ jobs:
136130
name: Build binary (Mac/Win)
137131
runs-on: ${{ matrix.os }}
138132
env:
139-
CABAL_VER: ${{ env.CABAL_VER_DEFAULT }}
140133
MACOSX_DEPLOYMENT_TARGET: 10.13
141134
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
142135
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -148,15 +141,12 @@ jobs:
148141
include:
149142
- os: [self-hosted, macOS, ARM64]
150143
ARTIFACT: "aarch64-apple-darwin-ghcup"
151-
GHC_VER: ${{ env.GHC_VER_DEFAULT }}
152144
ARCH: ARM64
153145
- os: macOS-15-intel
154146
ARTIFACT: "x86_64-apple-darwin-ghcup"
155-
GHC_VER: ${{ env.GHC_VER_DEFAULT }}
156147
ARCH: 64
157148
- os: windows-latest
158149
ARTIFACT: "x86_64-mingw64-ghcup"
159-
GHC_VER: ${{ env.GHC_VER_DEFAULT }}
160150
ARCH: 64
161151
steps:
162152
- name: Checkout code
@@ -176,7 +166,6 @@ jobs:
176166
env:
177167
ARTIFACT: ${{ matrix.ARTIFACT }}
178168
ARCH: ${{ matrix.ARCH }}
179-
GHC_VER: ${{ matrix.GHC_VER }}
180169
DISTRO: na
181170
AWS_SECRET_ACCESS_KEY: ${{ env.AWS_SECRET_ACCESS_KEY }}
182171
AWS_ACCESS_KEY_ID: ${{ env.AWS_ACCESS_KEY_ID }}
@@ -192,7 +181,6 @@ jobs:
192181
env:
193182
ARTIFACT: ${{ matrix.ARTIFACT }}
194183
ARCH: ${{ matrix.ARCH }}
195-
GHC_VER: ${{ matrix.GHC_VER }}
196184
DISTRO: na
197185
AWS_SECRET_ACCESS_KEY: ${{ env.AWS_SECRET_ACCESS_KEY }}
198186
AWS_ACCESS_KEY_ID: ${{ env.AWS_ACCESS_KEY_ID }}
@@ -207,7 +195,6 @@ jobs:
207195
env:
208196
ARTIFACT: ${{ matrix.ARTIFACT }}
209197
ARCH: ${{ matrix.ARCH }}
210-
GHC_VER: ${{ matrix.GHC_VER }}
211198
DISTRO: na
212199
AWS_SECRET_ACCESS_KEY: ${{ env.AWS_SECRET_ACCESS_KEY }}
213200
AWS_ACCESS_KEY_ID: ${{ env.AWS_ACCESS_KEY_ID }}
@@ -226,12 +213,10 @@ jobs:
226213
name: Build binary (FreeBSD)
227214
runs-on: [self-hosted, FreeBSD, X64]
228215
env:
229-
CABAL_VER: ${{ env.CABAL_VER_DEFAULT }}
230216
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
231217
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
232218
S3_HOST: ${{ secrets.S3_HOST }}
233219
ARTIFACT: "x86_64-portbld-freebsd-ghcup"
234-
GHC_VER: ${{ env.GHC_VER_DEFAULT }}
235220
ARCH: 64
236221
DISTRO: na
237222
RUNNER_OS: FreeBSD
@@ -266,12 +251,10 @@ jobs:
266251
name: Build binary (OpenBSD)
267252
runs-on: [self-hosted, openbsd, X64]
268253
env:
269-
CABAL_VER: ${{ env.CABAL_VER_DEFAULT }}
270254
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
271255
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
272256
S3_HOST: ${{ secrets.S3_HOST }}
273257
ARTIFACT: "x86_64-openbsd-ghcup"
274-
GHC_VER: ${{ env.GHC_VER_DEFAULT }}
275258
ARCH: 64
276259
DISTRO: na
277260
RUNNER_OS: OpenBSD
@@ -301,8 +284,6 @@ jobs:
301284
name: Test linux
302285
needs: "build-linux"
303286
runs-on: ${{ matrix.os }}
304-
env:
305-
CABAL_VER: ${{ env.CABAL_VER_DEFAULT }}
306287
strategy:
307288
matrix:
308289
include:
@@ -313,12 +294,10 @@ jobs:
313294
DISTRO: Alpine
314295
- os: ubuntu-latest
315296
ARTIFACT: "x86_64-linux-ghcup"
316-
GHC_VER: ${{ env.GHC_VER_DEFAULT }}
317297
ARCH: 64
318298
DISTRO: Alpine
319299
- os: ubuntu-latest
320300
ARTIFACT: "x86_64-linux-ghcup"
321-
GHC_VER: ${{ env.GHC_VER_DEFAULT }}
322301
ARCH: 64
323302
DISTRO: Ubuntu
324303

@@ -353,7 +332,6 @@ jobs:
353332
env:
354333
ARTIFACT: ${{ matrix.ARTIFACT }}
355334
ARCH: ${{ matrix.ARCH }}
356-
GHC_VER: ${{ matrix.GHC_VER }}
357335
DISTRO: ${{ matrix.DISTRO }}
358336

359337
- if: matrix.DISTRO != 'Alpine'
@@ -364,7 +342,6 @@ jobs:
364342
env:
365343
ARTIFACT: ${{ matrix.ARTIFACT }}
366344
ARCH: ${{ matrix.ARCH }}
367-
GHC_VER: ${{ matrix.GHC_VER }}
368345
DISTRO: ${{ matrix.DISTRO }}
369346

370347
- if: failure()
@@ -379,14 +356,11 @@ jobs:
379356
name: Test ARM
380357
needs: "build-arm"
381358
runs-on: ${{ matrix.os }}
382-
env:
383-
CABAL_VER: ${{ env.CABAL_VER_DEFAULT }}
384359
strategy:
385360
matrix:
386361
include:
387362
- os: [self-hosted, Linux, ARM64, maerwald]
388363
ARTIFACT: "aarch64-linux-ghcup"
389-
GHC_VER: ${{ env.GHC_VER_DEFAULT }}
390364
ARCH: ARM64
391365
DISTRO: Alpine
392366

@@ -410,7 +384,6 @@ jobs:
410384
env:
411385
ARTIFACT: ${{ matrix.ARTIFACT }}
412386
ARCH: ${{ matrix.ARCH }}
413-
GHC_VER: ${{ matrix.GHC_VER }}
414387
DISTRO: ${{ matrix.DISTRO }}
415388

416389
- if: failure()
@@ -426,24 +399,20 @@ jobs:
426399
needs: "build-macwin"
427400
runs-on: ${{ matrix.os }}
428401
env:
429-
CABAL_VER: ${{ env.CABAL_VER_DEFAULT }}
430402
MACOSX_DEPLOYMENT_TARGET: 10.13
431403
strategy:
432404
matrix:
433405
include:
434406
- os: [self-hosted, macOS, ARM64]
435407
ARTIFACT: "aarch64-apple-darwin-ghcup"
436-
GHC_VER: ${{ env.GHC_VER_DEFAULT }}
437408
ARCH: ARM64
438409
DISTRO: na
439410
- os: macOS-15-intel
440411
ARTIFACT: "x86_64-apple-darwin-ghcup"
441-
GHC_VER: ${{ env.GHC_VER_DEFAULT }}
442412
ARCH: 64
443413
DISTRO: na
444414
- os: windows-latest
445415
ARTIFACT: "x86_64-mingw64-ghcup"
446-
GHC_VER: ${{ env.GHC_VER_DEFAULT }}
447416
ARCH: 64
448417
DISTRO: na
449418

@@ -471,7 +440,6 @@ jobs:
471440
env:
472441
ARTIFACT: ${{ matrix.ARTIFACT }}
473442
ARCH: ${{ matrix.ARCH }}
474-
GHC_VER: ${{ matrix.GHC_VER }}
475443
DISTRO: ${{ matrix.DISTRO }}
476444
HOMEBREW_CHANGE_ARCH_TO_ARM: 1
477445

@@ -481,7 +449,6 @@ jobs:
481449
env:
482450
ARTIFACT: ${{ matrix.ARTIFACT }}
483451
ARCH: ${{ matrix.ARCH }}
484-
GHC_VER: ${{ matrix.GHC_VER }}
485452
DISTRO: ${{ matrix.DISTRO }}
486453
HOMEBREW_CHANGE_ARCH_TO_ARM: 1
487454

@@ -505,10 +472,7 @@ jobs:
505472
needs: "build-freebsd"
506473
runs-on: [self-hosted, FreeBSD, X64]
507474
env:
508-
CABAL_VER: ${{ env.CABAL_VER_DEFAULT }}
509-
MACOSX_DEPLOYMENT_TARGET: 10.13
510475
ARTIFACT: "x86_64-portbld-freebsd-ghcup"
511-
GHC_VER: ${{ env.GHC_VER_DEFAULT }}
512476
ARCH: 64
513477
DISTRO: na
514478
RUNNER_OS: FreeBSD
@@ -548,9 +512,7 @@ jobs:
548512
needs: "build-openbsd"
549513
runs-on: [self-hosted, openbsd, X64]
550514
env:
551-
CABAL_VER: ${{ env.CABAL_VER_DEFAULT }}
552515
ARTIFACT: "x86_64-openbsd-ghcup"
553-
GHC_VER: ${{ env.GHC_VER_DEFAULT }}
554516
ARCH: 64
555517
DISTRO: na
556518
RUNNER_OS: OpenBSD

0 commit comments

Comments
 (0)