Fixup

stable-haskell · Jun 29, 2024 · 56e9fae · 56e9fae
1 parent 40786e0
commit 56e9fae
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 11 deletions.
diff --git a/.github/scripts/build.sh b/.github/scripts/build.sh
@@ -28,15 +28,15 @@ ecabal user-config init -f
 
 # https://github.com/haskell/cabal/issues/7313#issuecomment-811851884
 if [ "$(getconf LONG_BIT)" == "32" ] || [ "${DISTRO}" == "CentOS" ] ; then
-    echo 'constraints: lukko -ofd-locking' >> cabal.project.release.local
+    echo 'constraints: lukko -ofd-locking' >> cabal.release.project.local
 fi
 
 # shellcheck disable=SC2206
 args=(
     -w "ghc-$GHC_VERSION"
     --disable-profiling
     --enable-executable-stripping
-    --project-file=cabal.project.release
+    --project-file=cabal.release.project
     ${ADD_CABAL_ARGS}
 )
 

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -14,7 +14,7 @@ jobs:
       ARCH: 64
       DEBIAN_FRONTEND: noninteractive
       TZ: Asia/Singapore
-      GHC_VERSION: 9.2.8
+      GHC_VERSION: 9.8.2
     strategy:
       fail-fast: false
       matrix:
@@ -39,6 +39,13 @@ jobs:
                     , ARTIFACT: "x86_64-linux-deb11"
                     , ADD_CABAL_ARGS: "--enable-split-sections"
                     },
+                    { image: "debian:12"
+                    , installCmd: "apt-get update && apt-get install -y"
+                    , 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"
+                    , DISTRO: "Debian"
+                    , ARTIFACT: "x86_64-linux-deb12"
+                    , ADD_CABAL_ARGS: "--enable-split-sections"
+                    },
                     { image: "ubuntu:18.04"
                     , installCmd: "apt-get update && apt-get install -y"
                     , 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,6 +67,20 @@ jobs:
                     , ARTIFACT: "x86_64-linux-ubuntu22.04"
                     , ADD_CABAL_ARGS: "--enable-split-sections"
                     },
+                    { image: "ubuntu:24.04"
+                    , installCmd: "apt-get update && apt-get install -y"
+                    , 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"
+                    , DISTRO: "Ubuntu"
+                    , ARTIFACT: "x86_64-linux-ubuntu24.04"
+                    , ADD_CABAL_ARGS: "--enable-split-sections"
+                    },
+                    { image: "linuxmintd/mint19-amd64"
+                    , installCmd: "apt-get update && apt-get install -y"
+                    , 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"
+                    , DISTRO: "Mint"
+                    , ARTIFACT: "x86_64-linux-mint19"
+                    , ADD_CABAL_ARGS: "--enable-split-sections"
+                    },
                     { image: "linuxmintd/mint20-amd64"
                     , installCmd: "apt-get update && apt-get install -y"
                     , 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"
@@ -181,7 +202,7 @@ jobs:
       TARBALL_EXT: tar.xz
       ARCH: 32
       TZ: Asia/Singapore
-      GHC_VERSION: 9.2.1
+      GHC_VERSION: 9.8.2
       DISTRO: "Unknown"
       ARTIFACT: "i386-linux-unknown"
       ADD_CABAL_ARGS: "--enable-split-sections --enable-executable-static"
@@ -217,17 +238,18 @@ jobs:
       TZ: Asia/Singapore
       ARCH: ARM64
       DISTRO: Debian
-      GHC_VERSION: 9.2.8
     strategy:
       fail-fast: false
       matrix:
         include:
           - os: [self-hosted, Linux, ARM64, maerwald]
             ARCH: ARM
             ARTIFACT: "armv7-linux-deb10"
+            GHC_VERSION: 9.2.8
           - os: [self-hosted, Linux, ARM64, maerwald]
             ARCH: ARM64
             ARTIFACT: "aarch64-linux-deb10"
+            GHC_VERSION: 9.8.2
     steps:
       - name: git config
         run: |
@@ -244,6 +266,7 @@ jobs:
           args: bash .github/scripts/build.sh
         env:
           ARTIFACT: ${{ matrix.ARTIFACT }}
+          GHC_VERSION: ${{ matrix.GHC_VERSION }}
 
       - if: matrix.ARCH == 'ARM64'
         uses: docker://hasufell/arm64v8-debian-haskell:10
@@ -252,6 +275,7 @@ jobs:
           args: bash .github/scripts/build.sh
         env:
           ARTIFACT: ${{ matrix.ARTIFACT }}
+          GHC_VERSION: ${{ matrix.GHC_VERSION }}
 
       - if: always()
         name: Upload artifact
@@ -273,7 +297,7 @@ jobs:
       ARCH: 64
       TARBALL_EXT: tar.xz
       DISTRO: na
-      GHC_VERSION: 9.2.8
+      GHC_VERSION: 9.8.2
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -304,7 +328,7 @@ jobs:
       TARBALL_EXT: tar.xz
       DISTRO: na
       HOMEBREW_CHANGE_ARCH_TO_ARM: 1
-      GHC_VERSION: 9.2.8
+      GHC_VERSION: 9.8.2
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -335,7 +359,7 @@ jobs:
       ARCH: 64
       TARBALL_EXT: "zip"
       DISTRO: na
-      GHC_VERSION: 9.2.8
+      GHC_VERSION: 9.8.2
     steps:
       - name: install windows deps
         shell: pwsh
@@ -375,7 +399,7 @@ jobs:
       ARCH: 64
       TARBALL_EXT: tar.xz
       DISTRO: na
-      GHC_VERSION: 9.2.8
+      GHC_VERSION: 9.8.2
       RUNNER_OS: FreeBSD
     steps:
       - name: Checkout code

diff --git a/cabal.release.project b/cabal.release.project
@@ -3,6 +3,15 @@ import: project-cabal/pkgs/install.config
 import: project-cabal/pkgs/tests.config
 
 constraints:
-  hashable -arch-native
+  hashable -arch-native,
+  tar >= 0.6.2.0,
+  bzlib-conduit >= 0.3.0.3,
+  bz2 >= 1.0.1.1,
+  bzlib >= 0.5.2.0,
+  directory >= 1.3.8.3,
+  filepath == 1.4.101.0 || == 1.4.300.1 || >= 1.5.2.0
+
+package zlib
+  flags: -pkg-config +bundled-c-zlib
 
 index-state: hackage.haskell.org 2024-06-17T00:00:01Z
diff --git a/cabal.validate.project b/cabal.validate.project
@@ -11,4 +11,13 @@ program-options
 -- This project file is used to distribute the cabal-head binary,
 -- as such we cannot enable "-march=native".
 constraints:
-  hashable -arch-native
+  hashable -arch-native,
+  tar >= 0.6.2.0,
+  bzlib-conduit >= 0.3.0.3,
+  bz2 >= 1.0.1.1,
+  bzlib >= 0.5.2.0,
+  directory >= 1.3.8.3,
+  filepath == 1.4.101.0 || == 1.4.300.1 || >= 1.5.2.0
+
+package zlib
+  flags: -pkg-config +bundled-c-zlib