Merge branch 'haskell:master' into smunix-patch-1

Author: smunix

.github/actions/setup-build/action.yml

@@ -31,7 +31,7 @@ runs:
         sudo chown -R $USER /usr/local/.ghcup
       shell: bash
 
-    - uses: haskell/actions/setup@v2.3.6
+    - uses: haskell/actions/setup@v2.4.1
       id: HaskEnvSetup
       with:
         ghc-version  : ${{ inputs.ghc   }}
@@ -50,12 +50,6 @@ runs:
         echo "CABAL_PKGS_DIR=~/.cabal/packages" >> $GITHUB_ENV
       shell: bash
 
-    - if: inputs.os == 'Windows' && inputs.ghc == '8.8.4'
-      name: (Windows,GHC 8.8) Modify `cabal.project` to workaround segfaults
-      run: |
-        echo -e 'package floskell\n  ghc-options: -O0' >> cabal.project.local
-      shell: bash
-
     # Shorten binary names as a workaround for filepath length limits in Windows,
     # but since tests are hardcoded on this workaround all platforms need it.
     # All workflows which distinguishes cache on `cabal.project` needs this.

.github/dependabot.yml

@@ -9,3 +9,8 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
+
+  - package-ecosystem: "github-actions"
+    directory: ".github/actions/setup-build"
+    schedule:
+      interval: "weekly"

.github/scripts/test.sh

@@ -54,7 +54,7 @@ env
 
 # ensure ghcup
 install_ghcup
-ghcup install ghc --set 9.4.4
+ghcup install ghc --set 9.4.5
 
 (cd .. && ecabal update) # run cabal update outside project dir
 

.github/workflows/bench.yml

@@ -48,7 +48,7 @@ jobs:
       matrix:
         ghc:
           - '8.10.7'
-          - '9.2.5'
+          - '9.2.7'
         os:
           - ubuntu-latest
 
@@ -115,13 +115,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ['8.10.7', '9.2.5']
+        ghc: ['8.10.7', '9.2.7']
         os: [ubuntu-latest]
         cabal: ['3.6']
         example: ['cabal', 'lsp-types']
 
     steps:
-    - uses: haskell/actions/setup@v2.3.7
+    - uses: haskell/actions/setup@v2.4.1
       with:
         ghc-version  : ${{ matrix.ghc   }}
         cabal-version: ${{ matrix.cabal }}

.github/workflows/flags.yml

@@ -76,7 +76,7 @@ jobs:
         run: cabal v2-build ghcide --flags="ghc-patched-unboxed-bytecode test-exe executable bench-exe ekg"
 
       # we have to clean up warnings for 9.0 and 9.2 before enable -Wall
-      - if: matrix.ghc != '9.0.2' && matrix.ghc != '9.2.5'
+      - if: matrix.ghc != '9.0.2' && matrix.ghc != '9.2.7'
         name: Build with pedantic (-WError)
         run: cabal v2-build --flags="pedantic"
 

.github/workflows/pre-commit.yml

@@ -27,7 +27,7 @@ jobs:
     - uses: ./.github/actions/setup-build
       with:
         # select a stable GHC version
-        ghc: 9.2.5
+        ghc: 9.2.7
         os: ${{ runner.os }}
         shorten-hls: false
 

.github/workflows/release.yaml

@@ -25,9 +25,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ["9.6.1", "9.4.4", "9.2.7", "9.0.2", "8.10.7"]
+        ghc: ["9.6.1", "9.4.5", "9.2.7", "9.0.2", "8.10.7"]
         platform: [ { image: "debian:9"
-                    , installCmd: "apt-get update && apt-get install -y"
+                    , installCmd: "sed -i s/deb.debian.org/archive.debian.org/g /etc/apt/sources.list && sed -i 's|security.debian.org|archive.debian.org/|g' /etc/apt/sources.list && sed -i /-updates/d /etc/apt/sources.list && 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-deb9"
@@ -105,15 +105,15 @@ jobs:
                     }
                   ]
         # TODO: rm
-        # we need a different image for 9.4.4, because GHC bindists are busted
+        # we need a different image for 9.4.5, because GHC bindists are busted
         include:
           - ghc: 8.10.7
             platform: { image: "rockylinux:8", installCmd: "yum -y install epel-release && yum install -y --allowerasing", toolRequirements: "autoconf automake binutils bzip2 coreutils curl elfutils-devel elfutils-libs findutils gcc gcc-c++ git gmp gmp-devel jq lbzip2 make ncurses ncurses-compat-libs ncurses-devel openssh-clients patch perl pxz python3 sqlite sudo wget which xz zlib-devel patchelf", DISTRO: "Unknown", ARTIFACT: "x86_64-linux-unknown", ADD_CABAL_ARGS: "--enable-split-sections" }
           - ghc: 9.0.2
             platform: { image: "rockylinux:8", installCmd: "yum -y install epel-release && yum install -y --allowerasing", toolRequirements: "autoconf automake binutils bzip2 coreutils curl elfutils-devel elfutils-libs findutils gcc gcc-c++ git gmp gmp-devel jq lbzip2 make ncurses ncurses-compat-libs ncurses-devel openssh-clients patch perl pxz python3 sqlite sudo wget which xz zlib-devel patchelf", DISTRO: "Unknown", ARTIFACT: "x86_64-linux-unknown", ADD_CABAL_ARGS: "--enable-split-sections" }
           - ghc: 9.2.7
             platform: { image: "rockylinux:8", installCmd: "yum -y install epel-release && yum install -y --allowerasing", toolRequirements: "autoconf automake binutils bzip2 coreutils curl elfutils-devel elfutils-libs findutils gcc gcc-c++ git gmp gmp-devel jq lbzip2 make ncurses ncurses-compat-libs ncurses-devel openssh-clients patch perl pxz python3 sqlite sudo wget which xz zlib-devel patchelf", DISTRO: "Unknown", ARTIFACT: "x86_64-linux-unknown", ADD_CABAL_ARGS: "--enable-split-sections" }
-          - ghc: 9.4.4
+          - ghc: 9.4.5
             platform: { image: "fedora:33", installCmd: "dnf install -y", toolRequirements: "autoconf automake binutils bzip2 coreutils curl elfutils-devel elfutils-libs findutils gcc gcc-c++ git gmp gmp-devel jq lbzip2 make ncurses ncurses-compat-libs ncurses-devel openssh-clients patch perl pxz python3 sqlite sudo wget which xz zlib-devel patchelf tree", DISTRO: "Unknown", ARTIFACT: "x86_64-linux-unknown", ADD_CABAL_ARGS: "--enable-split-sections" }
           - ghc: 9.6.1
             platform: { image: "rockylinux:8", installCmd: "yum -y install epel-release && yum install -y --allowerasing", toolRequirements: "autoconf automake binutils bzip2 coreutils curl elfutils-devel elfutils-libs findutils gcc gcc-c++ git gmp gmp-devel jq lbzip2 make ncurses ncurses-compat-libs ncurses-devel openssh-clients patch perl pxz python3 sqlite sudo wget which xz zlib-devel patchelf", DISTRO: "Unknown", ARTIFACT: "x86_64-linux-unknown", ADD_CABAL_ARGS: "--enable-split-sections" }
@@ -171,7 +171,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        ghc: ["9.6.1","9.4.4", "9.2.7", "9.0.2", "8.10.7"]
+        ghc: ["9.6.1","9.4.5", "9.2.7", "9.0.2", "8.10.7"]
     steps:
       - uses: docker://arm64v8/ubuntu:focal
         name: Cleanup (aarch64 linux)
@@ -212,7 +212,7 @@ jobs:
 
   build-mac-x86_64:
     name: Build binary (Mac x86_64)
-    runs-on: macOS-10.15
+    runs-on: macOS-11
     env:
       MACOSX_DEPLOYMENT_TARGET: 10.13
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -226,7 +226,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ["9.6.1", "9.4.4", "9.2.7", "9.0.2", "8.10.7"]
+        ghc: ["9.6.1", "9.4.5", "9.2.7", "9.0.2", "8.10.7"]
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -266,7 +266,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ["9.6.1", "9.4.4", "9.2.7", "8.10.7"]
+        ghc: ["9.6.1", "9.4.5", "9.2.7", "8.10.7"]
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -315,7 +315,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ["9.6.1", "9.4.4", "9.2.7", "9.0.2", "8.10.7"]
+        ghc: ["9.6.1", "9.4.5", "9.2.7", "9.0.2", "8.10.7"]
     steps:
       - name: install windows deps
         shell: pwsh
@@ -362,7 +362,7 @@ jobs:
       matrix:
         include:
           - image: debian:9
-            installCmd: apt-get update && apt-get install -y
+            installCmd: sed -i s/deb.debian.org/archive.debian.org/g /etc/apt/sources.list && sed -i 's|security.debian.org|archive.debian.org/|g' /etc/apt/sources.list && sed -i /-updates/d /etc/apt/sources.list && 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 tree
             DISTRO: Debian
             ARTIFACT: "x86_64-linux-deb9"
@@ -519,7 +519,7 @@ jobs:
 
   bindist-mac-x86_64:
     name: Tar bindists (Mac x86_64)
-    runs-on: macOS-10.15
+    runs-on: macOS-11
     needs: ["build-mac-x86_64"]
     env:
       TARBALL_EXT: tar.xz
@@ -657,7 +657,7 @@ jobs:
       matrix:
         include:
           - image: debian:9
-            installCmd: apt-get update && apt-get install -y
+            installCmd: sed -i s/deb.debian.org/archive.debian.org/g /etc/apt/sources.list && sed -i 's|security.debian.org|archive.debian.org/|g' /etc/apt/sources.list && sed -i /-updates/d /etc/apt/sources.list && 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 tree
             DISTRO: Debian
             ARTIFACT: "x86_64-linux-deb9"
@@ -780,7 +780,7 @@ jobs:
 
   test-mac-x86_64:
     name: Test binary (Mac x86_64)
-    runs-on: macOS-10.15
+    runs-on: macOS-11
     needs: ["bindist-mac-x86_64"]
     env:
       MACOSX_DEPLOYMENT_TARGET: 10.13

.github/workflows/supported-ghc-versions.json

@@ -1 +1 @@
-[ "9.6.1", "9.4.4" , "9.2.5" , "9.0.2" , "8.10.7" ]
+[ "9.6.1", "9.4.5" , "9.2.7" , "9.0.2" , "8.10.7" ]