Merge branch 'haskell:master' into wip/swordlash/ghcjs_browser_fix

haskell · Jan 1, 2025 · f0bebdd · f0bebdd
2 parents 222cbde + 81ebaf9
commit f0bebdd
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 88 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -12,9 +12,8 @@ task:
   name: OpenBSD
   compute_engine_instance:
     image_project: pg-ci-images
-    # OpenBSD version should match
-    # https://github.com/anarazel/pg-vm-images/blob/main/packer/openbsd.pkrvars.hcl
-    image: family/pg-ci-openbsd-vanilla-7-3
+    # See https://github.com/anarazel/pg-vm-images/blob/main/packer/openbsd.pkrvars.hcl
+    image: family/pg-ci-openbsd-vanilla
     platform: openbsd
   install_script: pkg_add ghc cabal-install git autoconf-2.71
   script:
@@ -30,9 +29,8 @@ task:
   name: NetBSD
   compute_engine_instance:
     image_project: pg-ci-images
-    # NetBSD version should match
-    # https://github.com/anarazel/pg-vm-images/blob/main/packer/netbsd.pkrvars.hcl
-    image: family/pg-ci-netbsd-vanilla-9-3
+    # See https://github.com/anarazel/pg-vm-images/blob/main/packer/netbsd.pkrvars.hcl
+    image: family/pg-ci-netbsd-vanilla
     platform: netbsd
   install_script:
     # Folders should be updated in line with

diff --git a/.github/scripts/env.sh b/.github/scripts/env.sh
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,8 +15,8 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        os: [ubuntu-22.04, macOS-latest]
-        ghc: ['9.8', '9.6', '9.4', '9.2', '9.0', '8.10', '8.8', '8.6']
+        os: [ubuntu-24.04, macOS-latest]
+        ghc: ['9.12', '9.10', '9.8', '9.6', '9.4', '9.2', '9.0', '8.10', '8.8', '8.6']
         exclude:
           - os: macos-latest
             ghc: '9.0'
@@ -28,9 +28,14 @@ jobs:
             ghc: '8.6'
     steps:
     - uses: actions/checkout@v4
+
+    - name: Install GHCup
+      uses: haskell/ghcup-setup@v1
+
     - name: Setup toolchain
       run: |
-        curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_INSTALL_NO_STACK=1 BOOTSTRAP_HASKELL_GHC_VERSION=${{ matrix.ghc }} BOOTSTRAP_HASKELL_ADJUST_BASHRC=yes sh
+        ghcup install ghc --set ${{ matrix.ghc }}
+        ghcup install cabal --set latest
 
     - if: runner.os == 'macOS'
       name: Install system deps via brew
@@ -42,10 +47,10 @@ jobs:
         path: |
           ~/.cabal/store
           dist-newstyle
-        key: ${{ runner.os }}-${{ matrix.ghc }}
+        key: ${{ runner.os }}-${{ matrix.ghc }}-${{ github.sha }}
+        restore-keys: ${{ runner.os }}-${{ matrix.ghc }}-
     - name: Build
       run: |
-        . ~/.ghcup/env
         ghc --version
         cabal --version
         cabal update
@@ -57,23 +62,29 @@ jobs:
         cabal test all --test-show-details=direct
     - name: Haddock
       run: |
-        . ~/.ghcup/env
         cabal haddock --disable-documentation
 
-  centos7:
-    runs-on: ubuntu-latest
+  redhat-ubi9:
+    runs-on: ubuntu-24.04
     container:
-      image: centos:7
+      image: redhat/ubi9:latest
     steps:
-    - name: Install
+    - name: Install prerequisites
       run: |
-        yum install -y gcc gmp gmp-devel make ncurses ncurses-compat-libs xz perl autoconf
-        curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_GHC_VERSION=9.2.8 sh
-    - uses: actions/checkout@v3
-        # actions/checkout@v4 (using node20) does not run on image: centos:7
+        yum install -y gcc gmp gmp-devel make ncurses xz perl autoconf
+
+    - name: Install GHCup
+      uses: haskell/ghcup-setup@v1
+
+    - name: Setup toolchain
+      run: |
+        ghcup install ghc --set latest
+        ghcup install cabal --set latest
+
+    - uses: actions/checkout@v4
+
     - name: Test
       run: |
-        source ~/.ghcup/env
         cabal --version
         cabal update
         autoreconf --version
@@ -85,14 +96,21 @@ jobs:
     container:
       image: fedora:37
     steps:
-    - name: Install
+    - name: Install prerequisites
       run: |
         dnf install -y gcc gmp gmp-devel make ncurses ncurses-compat-libs xz perl autoconf
-        curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 sh
+
+    - name: Install GHCup
+      uses: haskell/ghcup-setup@v1
+
+    - name: Setup toolchain
+      run: |
+        ghcup install ghc --set latest
+        ghcup install cabal --set latest
+
     - uses: actions/checkout@v4
     - name: Test
       run: |
-        source ~/.ghcup/env
         cabal --version
         cabal update
         autoreconf --version
@@ -102,23 +120,14 @@ jobs:
 
   i386:
     runs-on: ubuntu-latest
-    container:
-      image: i386/ubuntu:bionic
     steps:
-    - name: Install
-      run: |
-        apt-get update -y
-        apt-get install -y autoconf build-essential zlib1g-dev libgmp-dev curl
-        curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_INSTALL_NO_STACK=1 sh
-    - uses: actions/checkout@v1
-    - name: Test
-      run: |
-        source ~/.ghcup/env
-        cabal --version
-        cabal update
-        autoreconf --version
-        autoreconf -i
-        cabal v2-test --constraint 'optparse-applicative -process' --constraint 'QuickCheck +old-random' --constraint 'tasty -unix' all
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Run build (32 bit linux)
+        uses: docker://hasufell/i386-alpine-haskell:3.12
+        with:
+          args: sh -c "apk update && apk add --no-cache autoconf automake make && cabal update && autoreconf --version && autoreconf -i && cabal v2-test --constraint 'optparse-applicative -process' --constraint 'QuickCheck +old-random' --constraint 'tasty -unix' all"
 
   arm:
     runs-on: [self-hosted, Linux, ARM64]
@@ -161,14 +170,25 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
+      - name: Install prerequisites
+        run: |
+          sudo pkg install -y curl gcc gmp gmake ncurses perl5 libffi libiconv git bash misc/compat10x misc/compat11x misc/compat12x gmake autoconf
+
+      - name: Install GHCup
+        uses: haskell/ghcup-setup@v1
+
+      - name: Setup toolchain
+        run: |
+          ghcup install ghc --set ${{ matrix.ghc }}
+          ghcup install cabal --set latest
+
       - name: Run build
         run: |
-          pkg install -y curl gcc gmp gmake ncurses perl5 libffi libiconv git bash misc/compat10x misc/compat11x misc/compat12x gmake autoconf
-          . .github/scripts/env.sh
-          curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_INSTALL_NO_STACK=1 BOOTSTRAP_HASKELL_GHC_VERSION=${{ matrix.ghc }} BOOTSTRAP_HASKELL_ADJUST_BASHRC=yes sh
           autoreconf --version
           autoreconf -i
+          cabal update
           cabal sdist -z -o .
           cabal get unix-*.tar.gz
           cd unix-*/
           cabal test all --test-show-details=direct
+
diff --git a/.gitignore b/.gitignore
@@ -16,6 +16,8 @@ dist-newstyle/
 ghc.mk
 include/HsUnixConfig.h
 include/HsUnixConfig.h.in
+.stack-work/
+stack*.yaml.lock
 unix.buildinfo
 tests/.hpc.*
 tests/*.eventlog

diff --git a/cabal.haskell-ci b/cabal.haskell-ci
diff --git a/unix.cabal b/unix.cabal
@@ -11,7 +11,10 @@ bug-reports:    https://github.com/haskell/unix/issues
 synopsis:       POSIX functionality
 category:       System
 build-type:     Configure
-tested-with:    GHC==9.6.2,
+tested-with:    GHC==9.12.1,
+                GHC==9.10.1,
+                GHC==9.8.4,
+                GHC==9.6.6,
                 GHC==9.4.7,
                 GHC==9.2.8,
                 GHC==9.0.2,