Merge branch 'master' into drf-support-for-explicit-record-fields

Author: fendor

.github/actions/bindist-actions/action-centos7/action.yaml

@@ -0,0 +1,21 @@
+description: Container for deb12
+inputs:
+  stage:
+    description: which stage to build
+    required: true
+  version:
+    description: which GHC version to build/test
+    required: false
+name: action-deb12
+runs:
+  entrypoint: .github/scripts/entrypoint.sh
+  env:
+    GHC_VERSION: ${{ inputs.version }}
+    INSTALL: apt-get update && apt-get install -y
+    STAGE: ${{ inputs.stage }}
+    TOOLS: 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
+  image: debian:12
+  using: docker

.github/actions/bindist-actions/action-deb12/action.yaml

@@ -1,12 +1,12 @@
-description: Container for fedora27
+description: Container for fedora40
 inputs:
   stage:
     description: which stage to build
     required: true
   version:
     description: which GHC version to build/test
     required: false
-name: action-fedora27
+name: action-fedora40
 runs:
   entrypoint: .github/scripts/entrypoint.sh
   env:
@@ -17,5 +17,5 @@ runs:
       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
-  image: fedora:27
+  image: fedora:40
   using: docker

.github/actions/bindist-actions/action-fedora27/action.yaml renamed to .github/actions/bindist-actions/action-fedora40/action.yaml

@@ -0,0 +1,21 @@
+description: Container for mint213
+inputs:
+  stage:
+    description: which stage to build
+    required: true
+  version:
+    description: which GHC version to build/test
+    required: false
+name: action-mint213
+runs:
+  entrypoint: .github/scripts/entrypoint.sh
+  env:
+    GHC_VERSION: ${{ inputs.version }}
+    INSTALL: apt-get update && apt-get install -y
+    STAGE: ${{ inputs.stage }}
+    TOOLS: 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
+  image: linuxmintd/mint21.3-amd64
+  using: docker

.github/actions/bindist-actions/action-mint213/action.yaml

@@ -35,14 +35,15 @@ data Distro
   = Debian9
   | Debian10
   | Debian11
+  | Debian12
   | Ubuntu1804
   | Ubuntu2004
   | Ubuntu2204
   | Mint193
   | Mint202
-  | Fedora27
+  | Mint213
   | Fedora33
-  | Centos7
+  | Fedora40
   | Rocky8
   deriving (Eq, Enum, Bounded)
 
@@ -64,15 +65,15 @@ data GHC
   = GHC948
   | GHC967
   | GHC984
-  | GHC9101
+  | GHC9102
   | GHC9122
   deriving (Eq, Enum, Bounded)
 
 ghcVersion :: GHC -> String
 ghcVersion GHC948 = "9.4.8"
 ghcVersion GHC967 = "9.6.7"
 ghcVersion GHC984 = "9.8.4"
-ghcVersion GHC9101 = "9.10.1"
+ghcVersion GHC9102 = "9.10.2"
 ghcVersion GHC9122 = "9.12.2"
 
 ghcVersionIdent :: GHC -> String
@@ -91,56 +92,60 @@ distroImage :: Distro -> String
 distroImage Debian9 = "debian:9"
 distroImage Debian10 = "debian:10"
 distroImage Debian11 = "debian:11"
+distroImage Debian12 = "debian:12"
 distroImage Ubuntu1804 = "ubuntu:18.04"
 distroImage Ubuntu2004 = "ubuntu:20.04"
 distroImage Ubuntu2204 = "ubuntu:22.04"
 distroImage Mint193 = "linuxmintd/mint19.3-amd64"
 distroImage Mint202 = "linuxmintd/mint20.2-amd64"
-distroImage Fedora27 = "fedora:27"
+distroImage Mint213 = "linuxmintd/mint21.3-amd64"
 distroImage Fedora33 = "fedora:33"
-distroImage Centos7 = "centos:7"
+distroImage Fedora40 = "fedora:40"
 distroImage Rocky8 = "rockylinux:8"
 
 distroName :: Distro -> String
 distroName Debian9 = "deb9"
 distroName Debian10 = "deb10"
 distroName Debian11 = "deb11"
+distroName Debian12 = "deb12"
 distroName Ubuntu1804 = "ubuntu1804"
 distroName Ubuntu2004 = "ubuntu2004"
 distroName Ubuntu2204 = "ubuntu2204"
 distroName Mint193 = "mint193"
 distroName Mint202 = "mint202"
-distroName Fedora27 = "fedora27"
+distroName Mint213 = "mint213"
 distroName Fedora33 = "fedora33"
-distroName Centos7 = "centos7"
+distroName Fedora40 = "fedora40"
 distroName Rocky8 = "unknown"
 
 distroInstall :: Distro -> String
 distroInstall Debian9    = "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"
 distroInstall Debian10   = "apt-get update && apt-get install -y"
 distroInstall Debian11   = "apt-get update && apt-get install -y"
+distroInstall Debian12   = "apt-get update && apt-get install -y"
 distroInstall Ubuntu1804 = "apt-get update && apt-get install -y"
 distroInstall Ubuntu2004 = "apt-get update && apt-get install -y"
 distroInstall Ubuntu2204 = "apt-get update && apt-get install -y"
 distroInstall Mint193    = "apt-get update && apt-get install -y"
 distroInstall Mint202    = "apt-get update && apt-get install -y"
-distroInstall Fedora27   = "dnf install -y"
+distroInstall Mint213    = "apt-get update && apt-get install -y"
 distroInstall Fedora33   = "dnf install -y"
-distroInstall Centos7    = "sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* && sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* && yum -y install epel-release && yum install -y"
+distroInstall Fedora40   = "dnf install -y"
 distroInstall Rocky8     = "yum -y install epel-release && yum install -y --allowerasing"
 
 distroTools :: Distro -> String
 distroTools Debian9    = "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"
 distroTools Debian10   = "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"
 distroTools Debian11   = "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"
+distroTools Debian12   = "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"
 distroTools Ubuntu1804 = "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"
 distroTools Ubuntu2004 = "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"
 distroTools Ubuntu2204 = "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"
 distroTools Mint193    = "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"
 distroTools Mint202    = "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"
-distroTools Fedora27   = "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"
+distroTools Mint213    = "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"
 distroTools Fedora33   = "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"
-distroTools Centos7    = "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"
+distroTools Fedora40   = "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"
 distroTools Rocky8     = "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"
 
 -------------------------------------------------------------------------------

.github/generate-ci/gen_ci.hs

@@ -35,3 +35,5 @@ fi
 
 export DEBIAN_FRONTEND=noninteractive
 export TZ=Asia/Singapore
+export LANG=en_US.UTF-8
+export LC_ALL=C.UTF-8

.github/scripts/env.sh

@@ -60,7 +60,7 @@ test_all_hls() {
         fi
     done
     # install the recommended GHC version so the wrapper can launch HLS
-    ghcup install ghc --set 9.10.1
+    ghcup install ghc --set 9.10.2
     "$bindir/haskell-language-server-wrapper${ext}" typecheck "${test_module}" || fail "failed to typecheck with HLS wrapper"
 }