Skip to content

Commit eacd04a

Browse files
hasufellhasufell
committed
CI: use 3.17.0.1 pre-built binary
Since we now don't provide cabal anymore.
1 parent 07d68c5 commit eacd04a

File tree

1 file changed

+16
-26
lines changed

1 file changed

+16
-26
lines changed

‎.github/workflows/reusable-release.yml‎

Lines changed: 16 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616
default: "install_bin install_lib update_package_db"
1717
cabal:
1818
type: string
19-
default: 3.14.2.0
19+
default: 3.17.0.1
2020
test:
2121
type: boolean
2222
default: true
@@ -105,6 +105,11 @@ jobs:
105105
with:
106106
cabal: ${{ env.CABAL_VERSION }}
107107
ghc: ${{ env.GHC_VERSION }}
108+
config: &ghcup-config |
109+
meta-cache: 0
110+
url-source:
111+
- GHCupURL
112+
- https://raw.githubusercontent.com/haskell/ghcup-metadata/refs/heads/stable-haskell-0.0.1/stable-haskell-0.0.9.yaml
108113

109114
- uses: actions/checkout@v4
110115
with:
@@ -128,11 +133,6 @@ jobs:
128133
ln -s make /usr/local/bin/gmake
129134
echo "/usr/local/bin" >> $GITHUB_PATH
130135
131-
- name: Add extra-lib-dirs
132-
run: &extra-lib-dirs |
133-
echo "extra-lib-dirs: $HOME/.local/lib/" >> cabal.project.stage2
134-
echo "extra-lib-dirs: $HOME/.local/lib/" >> cabal.project.stage3
135-
136136
- if: matrix.platform.image == 'rockylinux:8'
137137
name: Install emscripten
138138
run : &emscripten |
@@ -166,16 +166,13 @@ jobs:
166166
cd emsdk
167167
source ./emsdk_env.sh
168168
cd ..
169-
${{ env.MAKE }} _build/bindist/haskell-toolchain.tar.gz _build/bindist/tests.tar.gz
169+
${{ env.MAKE }} _build/bindist/ghc.tar.gz _build/bindist/ghc-javascript-unknown-ghcjs.tar.gz _build/bindist/tests.tar.gz
170170
else
171-
echo $PWD
172-
${{ env.MAKE }} --debug _build/bindist/ghc.tar.gz _build/bindist/cabal.tar.gz _build/bindist/tests.tar.gz
171+
${{ env.MAKE }} _build/bindist/ghc.tar.gz _build/bindist/tests.tar.gz
173172
fi
174173
cd _build/bindist
175174
mv ghc.tar.gz ghc-$(bin/ghc --numeric-version)-${ARTIFACT}.tar.gz
176-
mv cabal.tar.gz cabal-$(bin/cabal --numeric-version)-${ARTIFACT}.tar.gz
177-
if [ -e "haskell-toolchain.tar.gz" ] ; then
178-
mv haskell-toolchain.tar.gz haskell-toolchain-${ARTIFACT}.tar.gz
175+
if [ -e "ghc-javascript-unknown-ghcjs.tar.gz" ] ; then
179176
mv ghc-javascript-unknown-ghcjs.tar.gz ghc-javascript-unknown-ghcjs-$(bin/ghc --numeric-version)-${ARTIFACT}.tar.gz
180177
fi
181178
mv tests.tar.gz tests-${ARTIFACT}.tar.gz
@@ -215,13 +212,13 @@ jobs:
215212
uses: docker://arm64v8/debian:11
216213
name: Run build (aarch64 linux)
217214
with:
218-
args: sh -c "apt-get update && apt-get install -y curl bash git ${{ needs.tool-output.outputs.apt_tools_build }} && export PATH=$HOME/.ghcup/bin:$PATH && curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh && make CABAL=$PWD/_build/stage0/bin/cabal _build/bindist/ghc.tar.gz _build/bindist/cabal.tar.gz _build/bindist/tests.tar.gz && cd _build/bindist && mv ghc.tar.gz ghc-$(bin/ghc --numeric-version)-${{ matrix.platform.ARTIFACT }}.tar.gz && mv cabal.tar.gz cabal-$(bin/cabal --numeric-version)-${{ matrix.platform.ARTIFACT }}.tar.gz && mv tests.tar.gz tests-${{ matrix.platform.ARTIFACT }}.tar.gz"
215+
args: sh -c "apt-get update && apt-get install -y curl bash git ${{ needs.tool-output.outputs.apt_tools_build }} && export PATH=$HOME/.ghcup/bin:$PATH && curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh && ghcup config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/refs/heads/stable-haskell-0.0.1/stable-haskell-0.0.9.yaml && make USE_SYSTEM_CABAL=1 _build/bindist/ghc.tar.gz _build/bindist/tests.tar.gz && cd _build/bindist && mv ghc.tar.gz ghc-$(bin/ghc --numeric-version)-${{ matrix.platform.ARTIFACT }}.tar.gz && mv tests.tar.gz tests-${{ matrix.platform.ARTIFACT }}.tar.gz"
219216

220217
- if: matrix.platform.ARTIFACT == 'aarch64-linux-unknown'
221218
uses: docker://arm64v8/alpine:3.20
222219
name: Run build (aarch64 linux alpine)
223220
with:
224-
args: sh -c "apk update && apk add curl bash git ${{ needs.tool-output.outputs.apk_tools_build }} && export PATH=$HOME/.ghcup/bin:$PATH && curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh && make CABAL=$PWD/_build/stage0/bin/cabal _build/bindist/ghc.tar.gz _build/bindist/cabal.tar.gz _build/bindist/tests.tar.gz && cd _build/bindist && mv ghc.tar.gz ghc-$(bin/ghc --numeric-version)-${{ matrix.platform.ARTIFACT }}.tar.gz && mv cabal.tar.gz cabal-$(bin/cabal --numeric-version)-${{ matrix.platform.ARTIFACT }}.tar.gz && mv tests.tar.gz tests-${{ matrix.platform.ARTIFACT }}.tar.gz"
221+
args: sh -c "apk update && apk add curl bash git ${{ needs.tool-output.outputs.apk_tools_build }} && export PATH=$HOME/.ghcup/bin:$PATH && curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh && ghcup config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/refs/heads/stable-haskell-0.0.1/stable-haskell-0.0.9.yaml && make USE_SYSTEM_CABAL=1 _build/bindist/ghc.tar.gz _build/bindist/tests.tar.gz && cd _build/bindist && mv ghc.tar.gz ghc-$(bin/ghc --numeric-version)-${{ matrix.platform.ARTIFACT }}.tar.gz && mv tests.tar.gz tests-${{ matrix.platform.ARTIFACT }}.tar.gz"
225222

226223
- if: always()
227224
name: Upload artifact
@@ -255,6 +252,7 @@ jobs:
255252
with:
256253
cabal: ${{ env.CABAL_VERSION }}
257254
ghc: ${{ env.GHC_VERSION }}
255+
config: *ghcup-config
258256

259257
- name: Install dependencies
260258
run : |
@@ -263,9 +261,6 @@ jobs:
263261
echo "/usr/local/opt/make/libexec/gnubin" >> $GITHUB_PATH
264262
echo "/usr/local/opt/libtool/libexec/gnubin" >> $GITHUB_PATH
265263
266-
- name: Add extra-lib-dirs
267-
run: *extra-lib-dirs
268-
269264
- name: Install emscripten
270265
run : *emscripten
271266

@@ -305,6 +300,7 @@ jobs:
305300
with:
306301
cabal: ${{ env.CABAL_VERSION }}
307302
ghc: ${{ env.GHC_VERSION }}
303+
config: *ghcup-config
308304

309305
- name: Install dependencies
310306
run : |
@@ -313,9 +309,6 @@ jobs:
313309
echo "/opt/homebrew/opt/make/libexec/gnubin" >> $GITHUB_PATH
314310
echo "/opt/homebrew/opt/libtool/libexec/gnubin" >> $GITHUB_PATH
315311
316-
- name: Add extra-lib-dirs
317-
run: *extra-lib-dirs
318-
319312
- name: Run build
320313
run: *build
321314

@@ -359,6 +352,7 @@ jobs:
359352
with:
360353
cabal: ${{ env.CABAL_VERSION }}
361354
ghc: ${{ env.GHC_VERSION }}
355+
config: *ghcup-config
362356
env:
363357
GHCUP_MSYS2: 'C:/msys64'
364358

@@ -401,6 +395,7 @@ jobs:
401395
with:
402396
cabal: ${{ env.CABAL_VERSION }}
403397
ghc: ${{ env.GHC_VERSION }}
398+
config: *ghcup-config
404399
env:
405400
LD: ld
406401
CC: cc
@@ -427,9 +422,6 @@ jobs:
427422
sudo tzsetup Etc/GMT
428423
sudo adjkerntz -a
429424
430-
- name: Add extra-lib-dirs
431-
run: *extra-lib-dirs
432-
433425
- name: Install emscripten
434426
run : |
435427
sudo pkg install -y emscripten
@@ -439,11 +431,9 @@ jobs:
439431
which ghc
440432
ghc --info
441433
cabal update
442-
gmake CABAL=$PWD/_build/stage0/bin/cabal _build/bindist/haskell-toolchain.tar.gz _build/bindist/tests.tar.gz
434+
gmake CABAL=${{ env.CABAL }} _build/bindist/ghc.tar.gz _build/bindist/ghc-javascript-unknown-ghcjs.tar.gz _build/bindist/tests.tar.gz
443435
cd _build/bindist
444436
mv ghc.tar.gz ghc-$(bin/ghc --numeric-version)-${{ env.ARTIFACT }}.tar.gz
445-
mv cabal.tar.gz cabal-$(bin/cabal --numeric-version)-${{ env.ARTIFACT }}.tar.gz
446-
mv haskell-toolchain.tar.gz haskell-toolchain-${{ env.ARTIFACT }}.tar.gz
447437
mv ghc-javascript-unknown-ghcjs.tar.gz ghc-javascript-unknown-ghcjs-$(bin/ghc --numeric-version)-${{ env.ARTIFACT }}.tar.gz
448438
mv tests.tar.gz tests-${{ env.ARTIFACT }}.tar.gz
449439
env:

0 commit comments

Comments
 (0)