diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 35f43b2680e..27606af75bc 100644 --- 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: @@ -181,7 +181,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,7 +217,6 @@ jobs: TZ: Asia/Singapore ARCH: ARM64 DISTRO: Debian - GHC_VERSION: 9.2.8 strategy: fail-fast: false matrix: @@ -225,9 +224,11 @@ jobs: - 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 +245,7 @@ jobs: args: bash .github/scripts/build.sh env: ARTIFACT: ${{ matrix.ARTIFACT }} + GHC_VERSION: ${{ matrix.GHC }} - if: matrix.ARCH == 'ARM64' uses: docker://hasufell/arm64v8-debian-haskell:10 @@ -252,6 +254,7 @@ jobs: args: bash .github/scripts/build.sh env: ARTIFACT: ${{ matrix.ARTIFACT }} + GHC_VERSION: ${{ matrix.GHC }} - if: always() name: Upload artifact @@ -273,7 +276,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 +307,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 +338,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 +378,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 index ffd7c18adc1..8e120e958d1 100644 --- 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 index 2e3084cccf0..d7a17e6188f 100644 --- 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