Skip to content

Commit 0f6d6d7

Browse files
hasufellhasufell
committed
Fixup
1 parent 40786e0 commit 0f6d6d7

File tree

5 files changed

+57
-15
lines changed

5 files changed

+57
-15
lines changed

‎.github/scripts/build.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ ecabal user-config init -f
2828

2929
# https://github.com/haskell/cabal/issues/7313#issuecomment-811851884
3030
if [ "$(getconf LONG_BIT)" == "32" ] || [ "${DISTRO}" == "CentOS" ] ; then
31-
echo 'constraints: lukko -ofd-locking' >> cabal.project.release.local
31+
echo 'constraints: lukko -ofd-locking' >> cabal.release.project.local
3232
fi
3333

3434
# shellcheck disable=SC2206
3535
args=(
3636
-w "ghc-$GHC_VERSION"
3737
--disable-profiling
3838
--enable-executable-stripping
39-
--project-file=cabal.project.release
39+
--project-file=cabal.release.project
4040
${ADD_CABAL_ARGS}
4141
)
4242

‎.github/scripts/env.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ fi
1212
export PATH="$HOME/.local/bin:$PATH"
1313

1414
export BOOTSTRAP_HASKELL_NONINTERACTIVE=1
15-
export BOOTSTRAP_HASKELL_CABAL_VERSION="${CABAL_VER:-3.6.2.0-p1}"
15+
export BOOTSTRAP_HASKELL_CABAL_VERSION="${CABAL_VER:-3.10.3.0}"
1616
export BOOTSTRAP_HASKELL_ADJUST_CABAL_CONFIG=no
1717
export BOOTSTRAP_HASKELL_INSTALL_NO_STACK=yes
1818
export BOOTSTRAP_HASKELL_ADJUST_BASHRC=1

‎.github/workflows/release.yaml‎

Lines changed: 34 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
ARCH: 64
1515
DEBIAN_FRONTEND: noninteractive
1616
TZ: Asia/Singapore
17-
GHC_VERSION: 9.2.8
17+
GHC_VERSION: 9.8.2
1818
strategy:
1919
fail-fast: false
2020
matrix:
@@ -39,6 +39,13 @@ jobs:
3939
, ARTIFACT: "x86_64-linux-deb11"
4040
, ADD_CABAL_ARGS: "--enable-split-sections"
4141
},
42+
{ image: "debian:12"
43+
, installCmd: "apt-get update && apt-get install -y"
44+
, toolRequirements: "libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev git wget lsb-release software-properties-common gnupg2 apt-transport-https gcc autoconf automake build-essential curl ghc gzip libffi-dev libncurses-dev libncurses5 libtinfo5 patchelf"
45+
, DISTRO: "Debian"
46+
, ARTIFACT: "x86_64-linux-deb12"
47+
, ADD_CABAL_ARGS: "--enable-split-sections"
48+
},
4249
{ image: "ubuntu:18.04"
4350
, installCmd: "apt-get update && apt-get install -y"
4451
, toolRequirements: "libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev git wget lsb-release software-properties-common gnupg2 apt-transport-https gcc autoconf automake build-essential curl ghc gzip libffi-dev libncurses-dev libncurses5 libtinfo5 patchelf"
@@ -60,14 +67,28 @@ jobs:
6067
, ARTIFACT: "x86_64-linux-ubuntu22.04"
6168
, ADD_CABAL_ARGS: "--enable-split-sections"
6269
},
63-
{ image: "linuxmintd/mint20-amd64"
70+
{ image: "ubuntu:24.04"
71+
, installCmd: "apt-get update && apt-get install -y"
72+
, toolRequirements: "libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev git wget lsb-release software-properties-common gnupg2 apt-transport-https gcc autoconf automake build-essential curl ghc gzip libffi-dev libncurses-dev libncurses6 libtinfo6 patchelf"
73+
, DISTRO: "Ubuntu"
74+
, ARTIFACT: "x86_64-linux-ubuntu24.04"
75+
, ADD_CABAL_ARGS: "--enable-split-sections"
76+
},
77+
{ image: "linuxmintd/mint19.3-amd64"
78+
, installCmd: "apt-get update && apt-get install -y"
79+
, toolRequirements: "libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev git wget lsb-release software-properties-common gnupg2 apt-transport-https gcc autoconf automake build-essential curl ghc gzip libffi-dev libncurses-dev libncurses5 libtinfo5 patchelf"
80+
, DISTRO: "Mint"
81+
, ARTIFACT: "x86_64-linux-mint19"
82+
, ADD_CABAL_ARGS: "--enable-split-sections"
83+
},
84+
{ image: "linuxmintd/mint20.3-amd64"
6485
, installCmd: "apt-get update && apt-get install -y"
6586
, toolRequirements: "libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev git wget lsb-release software-properties-common gnupg2 apt-transport-https gcc autoconf automake build-essential curl ghc gzip libffi-dev libncurses-dev libncurses5 libtinfo5 patchelf"
6687
, DISTRO: "Mint"
6788
, ARTIFACT: "x86_64-linux-mint20"
6889
, ADD_CABAL_ARGS: "--enable-split-sections"
6990
},
70-
{ image: "linuxmintd/mint21-amd64"
91+
{ image: "linuxmintd/mint21.3-amd64"
7192
, installCmd: "apt-get update && apt-get install -y"
7293
, toolRequirements: "libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev git wget lsb-release software-properties-common gnupg2 apt-transport-https gcc autoconf automake build-essential curl ghc gzip libffi-dev libncurses-dev libncurses5 libtinfo5 patchelf"
7394
, DISTRO: "Mint"
@@ -181,7 +202,7 @@ jobs:
181202
TARBALL_EXT: tar.xz
182203
ARCH: 32
183204
TZ: Asia/Singapore
184-
GHC_VERSION: 9.2.1
205+
GHC_VERSION: 9.8.2
185206
DISTRO: "Unknown"
186207
ARTIFACT: "i386-linux-unknown"
187208
ADD_CABAL_ARGS: "--enable-split-sections --enable-executable-static"
@@ -217,17 +238,18 @@ jobs:
217238
TZ: Asia/Singapore
218239
ARCH: ARM64
219240
DISTRO: Debian
220-
GHC_VERSION: 9.2.8
221241
strategy:
222242
fail-fast: false
223243
matrix:
224244
include:
225245
- os: [self-hosted, Linux, ARM64, maerwald]
226246
ARCH: ARM
227247
ARTIFACT: "armv7-linux-deb10"
248+
GHC_VERSION: 9.2.8
228249
- os: [self-hosted, Linux, ARM64, maerwald]
229250
ARCH: ARM64
230251
ARTIFACT: "aarch64-linux-deb10"
252+
GHC_VERSION: 9.8.2
231253
steps:
232254
- name: git config
233255
run: |
@@ -244,6 +266,7 @@ jobs:
244266
args: bash .github/scripts/build.sh
245267
env:
246268
ARTIFACT: ${{ matrix.ARTIFACT }}
269+
GHC_VERSION: ${{ matrix.GHC_VERSION }}
247270

248271
- if: matrix.ARCH == 'ARM64'
249272
uses: docker://hasufell/arm64v8-debian-haskell:10
@@ -252,6 +275,7 @@ jobs:
252275
args: bash .github/scripts/build.sh
253276
env:
254277
ARTIFACT: ${{ matrix.ARTIFACT }}
278+
GHC_VERSION: ${{ matrix.GHC_VERSION }}
255279

256280
- if: always()
257281
name: Upload artifact
@@ -265,15 +289,15 @@ jobs:
265289
266290
build-mac-x86_64:
267291
name: Build binary (Mac x86_64)
268-
runs-on: macOS-11
292+
runs-on: macOS-12
269293
env:
270294
MACOSX_DEPLOYMENT_TARGET: 10.13
271295
ADD_CABAL_ARGS: ""
272296
ARTIFACT: "x86_64-apple-darwin"
273297
ARCH: 64
274298
TARBALL_EXT: tar.xz
275299
DISTRO: na
276-
GHC_VERSION: 9.2.8
300+
GHC_VERSION: 9.8.2
277301
steps:
278302
- name: Checkout code
279303
uses: actions/checkout@v3
@@ -304,7 +328,7 @@ jobs:
304328
TARBALL_EXT: tar.xz
305329
DISTRO: na
306330
HOMEBREW_CHANGE_ARCH_TO_ARM: 1
307-
GHC_VERSION: 9.2.8
331+
GHC_VERSION: 9.8.2
308332
steps:
309333
- name: Checkout code
310334
uses: actions/checkout@v3
@@ -335,7 +359,7 @@ jobs:
335359
ARCH: 64
336360
TARBALL_EXT: "zip"
337361
DISTRO: na
338-
GHC_VERSION: 9.2.8
362+
GHC_VERSION: 9.8.2
339363
steps:
340364
- name: install windows deps
341365
shell: pwsh
@@ -375,7 +399,7 @@ jobs:
375399
ARCH: 64
376400
TARBALL_EXT: tar.xz
377401
DISTRO: na
378-
GHC_VERSION: 9.2.8
402+
GHC_VERSION: 9.8.2
379403
RUNNER_OS: FreeBSD
380404
steps:
381405
- name: Checkout code

‎cabal.release.project‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,15 @@ import: project-cabal/pkgs/install.config
33
import: project-cabal/pkgs/tests.config
44

55
constraints:
6-
hashable -arch-native
6+
hashable -arch-native,
7+
tar >= 0.6.2.0,
8+
bzlib-conduit >= 0.3.0.3,
9+
bz2 >= 1.0.1.1,
10+
bzlib >= 0.5.2.0,
11+
directory >= 1.3.8.3,
12+
filepath == 1.4.101.0 || == 1.4.300.1 || >= 1.5.2.0
13+
14+
package zlib
15+
flags: -pkg-config +bundled-c-zlib
716

817
index-state: hackage.haskell.org 2024-06-17T00:00:01Z

‎cabal.validate.project‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,13 @@ program-options
1111
-- This project file is used to distribute the cabal-head binary,
1212
-- as such we cannot enable "-march=native".
1313
constraints:
14-
hashable -arch-native
14+
hashable -arch-native,
15+
tar >= 0.6.2.0,
16+
bzlib-conduit >= 0.3.0.3,
17+
bz2 >= 1.0.1.1,
18+
bzlib >= 0.5.2.0,
19+
directory >= 1.3.8.3,
20+
filepath == 1.4.101.0 || == 1.4.300.1 || >= 1.5.2.0
21+
22+
package zlib
23+
flags: -pkg-config +bundled-c-zlib

0 commit comments

Comments
 (0)