Skip to content

Commit

Permalink
Support GHC-9.6 wrt #979
Browse files Browse the repository at this point in the history
  • Loading branch information
@hasufell
hasufell committed Apr 17, 2024
1 parent eebbc99 commit cb74721
Show file tree
Hide file tree
Showing 28 changed files with 949 additions and 346 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cabal.project.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
fail-fast: false
matrix:
os: [macOS-latest, macOS-11, windows-latest, ubuntu-latest]
ghc: ["8.10.7", "9.0.2", "9.2.8", "9.4.8"]
ghc: ["8.10.7", "9.0.2", "9.2.8", "9.4.8", "9.6.4"]
steps:
- name: Checkout code
uses: actions/checkout@v4
Expand Down
55 changes: 28 additions & 27 deletions .github/workflows/release.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
name: Build linux binary
runs-on: ${{ matrix.os }}
env:
CABAL_VER: 3.10.2.0
CABAL_VER: 3.10.3.0
JSON_VERSION: "0.0.8"
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
Expand All @@ -36,7 +36,7 @@ jobs:
ARCH: 32
- os: ubuntu-latest
ARTIFACT: "x86_64-linux-ghcup"
GHC_VER: 9.4.8
GHC_VER: 9.6.4
ARCH: 64
steps:
- name: Checkout code
Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
name: Build ARM binary
runs-on: ${{ matrix.os }}
env:
CABAL_VER: 3.6.2.0
CABAL_VER: 3.10.3.0
JSON_VERSION: "0.0.8"
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
Expand All @@ -100,7 +100,7 @@ jobs:
ARCH: ARM
- os: [self-hosted, Linux, ARM64, maerwald]
ARTIFACT: "aarch64-linux-ghcup"
GHC_VER: 9.4.8
GHC_VER: 9.6.4
ARCH: ARM64
steps:
- name: git config
Expand Down Expand Up @@ -154,27 +154,28 @@ jobs:
name: Build binary (Mac/Win)
runs-on: ${{ matrix.os }}
env:
CABAL_VER: 3.10.2.0
CABAL_VER: 3.10.3.0
MACOSX_DEPLOYMENT_TARGET: 10.13
JSON_VERSION: "0.0.8"
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
S3_HOST: ${{ secrets.S3_HOST }}
LLVM_VER: 16
strategy:
fail-fast: false
matrix:
include:
- os: [self-hosted, macOS, ARM64]
ARTIFACT: "aarch64-apple-darwin-ghcup"
GHC_VER: 9.4.8
GHC_VER: 9.6.4
ARCH: ARM64
- os: macOS-11
ARTIFACT: "x86_64-apple-darwin-ghcup"
GHC_VER: 9.4.8
GHC_VER: 9.6.4
ARCH: 64
- os: windows-latest
ARTIFACT: "x86_64-mingw64-ghcup"
GHC_VER: 9.4.8
GHC_VER: 9.6.4
ARCH: 64
steps:
- name: Checkout code
Expand All @@ -185,13 +186,13 @@ jobs:
- if: matrix.ARCH == 'ARM64' && runner.os == 'macOS'
name: Run build
run: |
bash .github/scripts/brew.sh git coreutils llvm@13 autoconf automake
export PATH="$HOME/.brew/bin:$HOME/.brew/sbin:$HOME/.brew/opt/llvm@13/bin:$PATH"
export CC="$HOME/.brew/opt/llvm@13/bin/clang"
export CXX="$HOME/.brew/opt/llvm@13/bin/clang++"
bash .github/scripts/brew.sh git coreutils llvm@${{ env.LLVM_VER }} autoconf automake
export PATH="$HOME/.brew/bin:$HOME/.brew/sbin:$HOME/.brew/opt/llvm@${{ env.LLVM_VER }}/bin:$PATH"
export CC="$HOME/.brew/opt/llvm@${{ env.LLVM_VER }}/bin/clang"
export CXX="$HOME/.brew/opt/llvm@${{ env.LLVM_VER }}/bin/clang++"
export LD=ld
export AR="$HOME/.brew/opt/llvm@13/bin/llvm-ar"
export RANLIB="$HOME/.brew/opt/llvm@13/bin/llvm-ranlib"
export AR="$HOME/.brew/opt/llvm@${{ env.LLVM_VER }}/bin/llvm-ar"
export RANLIB="$HOME/.brew/opt/llvm@${{ env.LLVM_VER }}/bin/llvm-ranlib"
bash .github/scripts/build.sh
env:
ARTIFACT: ${{ matrix.ARTIFACT }}
Expand Down Expand Up @@ -246,14 +247,14 @@ jobs:
name: Build binary (FreeBSD)
runs-on: [self-hosted, FreeBSD, X64]
env:
CABAL_VER: 3.10.2.0
CABAL_VER: 3.10.3.0
MACOSX_DEPLOYMENT_TARGET: 10.13
JSON_VERSION: "0.0.8"
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
S3_HOST: ${{ secrets.S3_HOST }}
ARTIFACT: "x86_64-portbld-freebsd-ghcup"
GHC_VER: 9.4.8
GHC_VER: 9.6.4
ARCH: 64
DISTRO: na
RUNNER_OS: FreeBSD
Expand Down Expand Up @@ -283,7 +284,7 @@ jobs:
needs: "build-linux"
runs-on: ${{ matrix.os }}
env:
CABAL_VER: 3.10.2.0
CABAL_VER: 3.10.3.0
JSON_VERSION: "0.0.8"
strategy:
matrix:
Expand All @@ -295,12 +296,12 @@ jobs:
DISTRO: Alpine
- os: ubuntu-latest
ARTIFACT: "x86_64-linux-ghcup"
GHC_VER: 9.4.8
GHC_VER: 9.6.4
ARCH: 64
DISTRO: Alpine
- os: ubuntu-latest
ARTIFACT: "x86_64-linux-ghcup"
GHC_VER: 9.4.8
GHC_VER: 9.6.4
ARCH: 64
DISTRO: Ubuntu

Expand Down Expand Up @@ -361,7 +362,7 @@ jobs:
needs: "build-arm"
runs-on: ${{ matrix.os }}
env:
CABAL_VER: 3.6.2.0
CABAL_VER: 3.10.3.0
JSON_VERSION: "0.0.8"
strategy:
matrix:
Expand All @@ -373,7 +374,7 @@ jobs:
DISTRO: Ubuntu
- os: [self-hosted, Linux, ARM64, maerwald]
ARTIFACT: "aarch64-linux-ghcup"
GHC_VER: 9.4.8
GHC_VER: 9.6.4
ARCH: ARM64
DISTRO: Ubuntu

Expand Down Expand Up @@ -424,25 +425,25 @@ jobs:
needs: "build-macwin"
runs-on: ${{ matrix.os }}
env:
CABAL_VER: 3.10.2.0
CABAL_VER: 3.10.3.0
MACOSX_DEPLOYMENT_TARGET: 10.13
JSON_VERSION: "0.0.8"
strategy:
matrix:
include:
- os: [self-hosted, macOS, ARM64]
ARTIFACT: "aarch64-apple-darwin-ghcup"
GHC_VER: 9.4.8
GHC_VER: 9.6.4
ARCH: ARM64
DISTRO: na
- os: macOS-11
ARTIFACT: "x86_64-apple-darwin-ghcup"
GHC_VER: 9.4.8
GHC_VER: 9.6.4
ARCH: 64
DISTRO: na
- os: windows-latest
ARTIFACT: "x86_64-mingw64-ghcup"
GHC_VER: 9.4.8
GHC_VER: 9.6.4
ARCH: 64
DISTRO: na

Expand Down Expand Up @@ -500,11 +501,11 @@ jobs:
needs: "build-freebsd"
runs-on: [self-hosted, FreeBSD, X64]
env:
CABAL_VER: 3.10.2.0
CABAL_VER: 3.10.3.0
MACOSX_DEPLOYMENT_TARGET: 10.13
JSON_VERSION: "0.0.8"
ARTIFACT: "x86_64-portbld-freebsd-ghcup"
GHC_VER: 9.4.8
GHC_VER: 9.6.4
ARCH: 64
DISTRO: na
RUNNER_OS: FreeBSD
Expand Down
17 changes: 8 additions & 9 deletions cabal.ghc8107.Unix.project
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,13 @@ else

constraints: http-io-streams -brotli,
any.aeson >= 2.0.1.0,
any.hsc2hs ==0.68.8,
any.hsc2hs >=0.68.10,
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
filepath == 1.4.101.0 || == 1.4.300.1 || >= 1.5.2.0,
tar >= 0.6.2.0

if os(mingw32)
constraints: zlib +bundled-c-zlib,
Expand All @@ -28,11 +29,6 @@ if os(mingw32)
constraints: language-c >= 0.9.3


source-repository-package
type: git
location: https://github.com/haskell/tar.git
tag: d94a988be4311b830149a9f8fc16739927e5fc1c

source-repository-package
type: git
location: https://github.com/hasufell/uri-bytestring.git
Expand All @@ -51,10 +47,13 @@ package aeson
flags: +ordered-keymap

package streamly
flags: +use-unliftio
flags: +use-unliftio -streamly-core

package *
test-show-details: direct

allow-newer: cabal-install-parsers:tar, streamly:Win32
if impl(ghc >= 9.6)
allow-newer: streamly:Win32, streamly:ghc-prim, streamly:unicode-data, streamly:base, semigroupoids:base
else
allow-newer: streamly:Win32

44 changes: 22 additions & 22 deletions cabal.ghc8107.Unix.project.freeze
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
active-repositories: hackage.haskell.org:merge
constraints: any.Cabal ==3.10.2.1,
any.Cabal-syntax ==3.10.2.0,
constraints: any.Cabal ==3.10.3.0,
any.Cabal-syntax ==3.10.3.0,
any.HUnit ==1.6.2.0,
any.HsOpenSSL ==0.11.7.6,
HsOpenSSL -fast-bignum -homebrew-openssl -macports-openssl -use-pkg-config,
Expand Down Expand Up @@ -34,19 +34,18 @@ constraints: any.Cabal ==3.10.2.1,
any.base-orphans ==0.9.1,
any.base16-bytestring ==1.0.2.0,
any.base64-bytestring ==1.2.1.0,
any.bifunctors ==5.6.1,
any.bifunctors ==5.6.2,
bifunctors +tagged,
any.bimap ==0.5.0,
any.binary ==0.8.9.1,
any.binary ==0.8.9.2,
any.binary-instances ==1.0.4,
any.binary-orphans ==1.0.4.1,
any.blaze-builder ==0.4.2.3,
any.brick ==2.1.1,
brick -demos,
any.bytestring ==0.11.5.3,
any.bz2 ==1.0.1.1,
any.bz2 ==1.0.1.2,
bz2 -cross +with-bzlib,
any.bzip2-clib ==1.0.8,
any.c2hs ==0.28.8,
c2hs +base3 -regression,
any.cabal-install-parsers ==0.6.1.1,
Expand Down Expand Up @@ -77,7 +76,7 @@ constraints: any.Cabal ==3.10.2.1,
any.data-clist ==0.2,
any.data-fix ==0.3.2,
any.deepseq ==1.4.4.0,
any.directory ==1.3.8.3,
any.directory ==1.3.8.4,
directory -os-string,
any.disk-free-space ==0.1.0.1,
any.distributive ==0.6.2.1,
Expand All @@ -86,7 +85,7 @@ constraints: any.Cabal ==3.10.2.1,
dlist -werror,
any.exceptions ==0.10.4,
any.file-uri ==0.1.0.0,
any.filepath ==1.4.101.0,
any.filepath ==1.4.300.1,
filepath -cpphs,
any.foldable1-classes-compat ==0.1,
foldable1-classes-compat +tagged,
Expand All @@ -98,19 +97,20 @@ constraints: any.Cabal ==3.10.2.1,
any.ghc-byteorder ==4.11.0.0.10,
any.ghc-prim ==0.6.1,
any.happy ==1.20.1.1,
any.hashable ==1.4.3.0,
any.hashable ==1.4.4.0,
hashable +integer-gmp -random-initial-seed,
any.haskell-lexer ==1.1.1,
any.haskus-utils-data ==1.4,
any.haskus-utils-types ==1.5.1,
any.haskus-utils-variant ==3.3,
any.haskus-utils-variant ==3.4,
haskus-utils-variant +unliftio,
any.heaps ==0.4,
any.hsc2hs ==0.68.8,
any.hsc2hs ==0.68.10,
hsc2hs -in-ghc-tree,
any.hspec ==2.10.10,
any.hspec-core ==2.10.10,
any.hspec-discover ==2.10.10,
any.hspec-expectations ==0.8.2,
any.hspec ==2.11.7,
any.hspec-core ==2.11.7,
any.hspec-discover ==2.11.7,
any.hspec-expectations ==0.8.4,
any.hspec-golden-aeson ==0.9.0.0,
any.http-io-streams ==0.1.7.0,
http-io-streams -brotli +fast-xor,
Expand Down Expand Up @@ -154,14 +154,15 @@ constraints: any.Cabal ==3.10.2.1,
optparse-applicative +process,
any.os-release ==1.0.2.1,
os-release -devel,
any.os-string ==2.0.2,
any.parsec ==3.1.17.0,
any.parser-combinators ==1.3.0,
parser-combinators -dev,
any.polyparse ==1.13,
any.pretty ==1.1.3.6,
any.pretty-terminal ==0.1.0.0,
any.primitive ==0.8.0.0,
any.process ==1.6.18.0,
any.process ==1.6.19.0,
any.profunctors ==5.6.2,
any.quickcheck-arbitrary-adt ==0.3.1.0,
any.quickcheck-io ==0.2.0,
Expand All @@ -183,7 +184,6 @@ constraints: any.Cabal ==3.10.2.1,
semialign +semigroupoids,
any.semigroupoids ==6.0.0.1,
semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers,
any.setenv ==0.1.1.3,
any.split ==0.2.5,
any.splitmix ==0.1.0.5,
splitmix -optimised-mixer,
Expand All @@ -195,7 +195,7 @@ constraints: any.Cabal ==3.10.2.1,
any.tagged ==0.8.8,
tagged +deepseq +transformers,
any.tagsoup ==0.14.8,
any.tar ==0.6.0.0,
any.tar ==0.6.2.0,
any.tasty ==1.5,
tasty +unix,
any.tasty-hunit ==0.10.1,
Expand All @@ -213,7 +213,7 @@ constraints: any.Cabal ==3.10.2.1,
any.text-zipper ==0.13,
any.tf-random ==0.5,
any.th-abstraction ==0.6.0.0,
any.th-compat ==0.1.4,
any.th-compat ==0.1.5,
any.th-lift ==0.8.4,
any.th-lift-instances ==0.1.20,
any.these ==1.2,
Expand All @@ -227,9 +227,9 @@ constraints: any.Cabal ==3.10.2.1,
transformers-compat -five +five-three -four +generic-deriving +mtl -three -two,
any.unicode-data ==0.3.1,
unicode-data -ucd2haskell,
any.unix ==2.8.5.0,
any.unix ==2.8.5.1,
unix -os-string,
any.unix-bytestring ==0.3.7.8,
any.unix-bytestring ==0.4.0.1,
any.unix-compat ==0.7.1,
unix-compat -old-time,
any.unliftio-core ==0.2.1.0,
Expand Down Expand Up @@ -257,4 +257,4 @@ constraints: any.Cabal ==3.10.2.1,
any.zlib ==0.6.3.0,
zlib -bundled-c-zlib -non-blocking-ffi -pkg-config,
any.zlib-bindings ==0.1.1.5
index-state: hackage.haskell.org 2024-03-13T09:43:35Z
index-state: hackage.haskell.org 2024-04-15T02:49:22Z
Loading

0 comments on commit cb74721

Please sign in to comment.