From 39200ce82667dd37d1cea47603579a5ac96f9c79 Mon Sep 17 00:00:00 2001 From: Bodigrim Date: Mon, 21 Apr 2025 14:47:18 +0100 Subject: [PATCH 1/2] Update CI configuration --- .cirrus.yml | 4 ++-- .github/workflows/emulated.yml | 2 +- .github/workflows/haskell-ci.yml | 20 ++++++++++---------- text.cabal | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index fce61227..2639f681 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,7 +1,7 @@ task: name: FreeBSD freebsd_instance: - image_family: freebsd-14-0 + image_family: freebsd-14-2 install_script: - pkg install -y git gmake - curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_INSTALL_NO_STACK=1 sh @@ -32,7 +32,7 @@ task: install_script: # Folders should be updated in line with # http://cdn.netbsd.org/pub/pkgsrc/packages/NetBSD/x86_64/ - - export PKG_PATH="http://cdn.NetBSD.org/pub/pkgsrc/packages/NetBSD/$(uname -p)/$(uname -r|cut -f '1 2' -d.)/All/;http://cdn.netbsd.org/pub/pkgsrc/packages/NetBSD/x86_64/9.0_2023Q1/All/" + - export PKG_PATH="http://cdn.NetBSD.org/pub/pkgsrc/packages/NetBSD/$(uname -p)/$(uname -r|cut -f '1 2' -d.)/All/;http://cdn.netbsd.org/pub/pkgsrc/packages/NetBSD/x86_64/10.0_2025Q1/All/" - echo $PKG_PATH - pkg_add ghc cabal-install git script: diff --git a/.github/workflows/emulated.yml b/.github/workflows/emulated.yml index 70d1de9b..7004f721 100644 --- a/.github/workflows/emulated.yml +++ b/.github/workflows/emulated.yml @@ -22,7 +22,7 @@ jobs: arch: ['s390x', 'ppc64le'] steps: - uses: actions/checkout@v4 - - uses: uraimo/run-on-arch-action@v2.8.1 + - uses: uraimo/run-on-arch-action@v3 timeout-minutes: 60 with: arch: ${{ matrix.arch }} diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index fb6abbc0..5ae56aec 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -8,9 +8,9 @@ # # For more information, see https://github.com/haskell-CI/haskell-ci # -# version: 0.19.20250104 +# version: 0.19.20250330 # -# REGENDATA ("0.19.20250104",["github","--config=cabal.haskell-ci","text.cabal"]) +# REGENDATA ("0.19.20250330",["github","--config=cabal.haskell-ci","text.cabal"]) # name: Haskell-CI on: @@ -19,7 +19,7 @@ on: jobs: linux: name: Haskell-CI - Linux - ${{ matrix.compiler }} - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 timeout-minutes: 60 container: @@ -28,9 +28,9 @@ jobs: strategy: matrix: include: - - compiler: ghc-9.12.1 + - compiler: ghc-9.12.2 compilerKind: ghc - compilerVersion: 9.12.1 + compilerVersion: 9.12.2 setup-method: ghcup allow-failure: false - compiler: ghc-9.10.1 @@ -43,9 +43,9 @@ jobs: compilerVersion: 9.8.4 setup-method: ghcup allow-failure: false - - compiler: ghc-9.6.6 + - compiler: ghc-9.6.7 compilerKind: ghc - compilerVersion: 9.6.6 + compilerVersion: 9.6.7 setup-method: ghcup allow-failure: false - compiler: ghc-9.4.8 @@ -92,12 +92,12 @@ jobs: - name: Install GHCup run: | mkdir -p "$HOME/.ghcup/bin" - curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup" + curl -sL https://downloads.haskell.org/ghcup/0.1.50.1/x86_64-linux-ghcup-0.1.50.1 > "$HOME/.ghcup/bin/ghcup" chmod a+x "$HOME/.ghcup/bin/ghcup" - name: Install cabal-install run: | - "$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.1 || (cat "$HOME"/.ghcup/logs/*.* && false) - echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.1 -vnormal+nowrap" >> "$GITHUB_ENV" + "$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.1-p1 || (cat "$HOME"/.ghcup/logs/*.* && false) + echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.1-p1 -vnormal+nowrap" >> "$GITHUB_ENV" - name: Install GHC (GHCup) if: matrix.setup-method == 'ghcup' run: | diff --git a/text.cabal b/text.cabal index b9f5f312..168febea 100644 --- a/text.cabal +++ b/text.cabal @@ -53,10 +53,10 @@ tested-with: GHC == 9.0.2 GHC == 9.2.8 GHC == 9.4.8 - GHC == 9.6.6 + GHC == 9.6.7 GHC == 9.8.4 GHC == 9.10.1 - GHC == 9.12.1 + GHC == 9.12.2 extra-source-files: -- scripts/CaseFolding.txt From 013f3a61328eab42fff6d4aee1d6e0963def5757 Mon Sep 17 00:00:00 2001 From: Bodigrim Date: Mon, 21 Apr 2025 16:04:53 +0100 Subject: [PATCH 2/2] Regenerate case mappings --- scripts/regenerate.sh | 2 +- src/Data/Text/Internal/Fusion/CaseMapping.hs | 81 ++++++++++++++++++++ 2 files changed, 82 insertions(+), 1 deletion(-) diff --git a/scripts/regenerate.sh b/scripts/regenerate.sh index d3656483..e267f6e8 100755 --- a/scripts/regenerate.sh +++ b/scripts/regenerate.sh @@ -2,6 +2,6 @@ set -eu cd "${BASH_SOURCE%/*}/" wget http://www.unicode.org/Public/UCD/latest/ucd/SpecialCasing.txt http://www.unicode.org/Public/UCD/latest/ucd/CaseFolding.txt -runghc-9.2 CaseMapping +runghc-9.12 CaseMapping rm SpecialCasing.txt CaseFolding.txt cd - diff --git a/src/Data/Text/Internal/Fusion/CaseMapping.hs b/src/Data/Text/Internal/Fusion/CaseMapping.hs index 2ddb0a4b..5531193a 100644 --- a/src/Data/Text/Internal/Fusion/CaseMapping.hs +++ b/src/Data/Text/Internal/Fusion/CaseMapping.hs @@ -350,6 +350,7 @@ upperMapping = \case '\x0195'# -> unI64 502 '\x0199'# -> unI64 408 '\x019a'# -> unI64 573 + '\x019b'# -> unI64 42972 '\x019e'# -> unI64 544 '\x01a1'# -> unI64 416 '\x01a3'# -> unI64 418 @@ -440,6 +441,7 @@ upperMapping = \case '\x0260'# -> unI64 403 '\x0261'# -> unI64 42924 '\x0263'# -> unI64 404 + '\x0264'# -> unI64 42955 '\x0265'# -> unI64 42893 '\x0266'# -> unI64 42922 '\x0268'# -> unI64 407 @@ -776,6 +778,7 @@ upperMapping = \case '\x1c86'# -> unI64 1066 '\x1c87'# -> unI64 1122 '\x1c88'# -> unI64 42570 + '\x1c8a'# -> unI64 7305 '\x1d79'# -> unI64 42877 '\x1d7d'# -> unI64 11363 '\x1d8e'# -> unI64 42950 @@ -1272,9 +1275,11 @@ upperMapping = \case '\xa7c3'# -> unI64 42946 '\xa7c8'# -> unI64 42951 '\xa7ca'# -> unI64 42953 + '\xa7cd'# -> unI64 42956 '\xa7d1'# -> unI64 42960 '\xa7d7'# -> unI64 42966 '\xa7d9'# -> unI64 42968 + '\xa7db'# -> unI64 42970 '\xa7f6'# -> unI64 42997 '\xab53'# -> unI64 42931 '\xab70'# -> unI64 5024 @@ -1545,6 +1550,28 @@ upperMapping = \case '\x10cf0'# -> unI64 68784 '\x10cf1'# -> unI64 68785 '\x10cf2'# -> unI64 68786 + '\x10d70'# -> unI64 68944 + '\x10d71'# -> unI64 68945 + '\x10d72'# -> unI64 68946 + '\x10d73'# -> unI64 68947 + '\x10d74'# -> unI64 68948 + '\x10d75'# -> unI64 68949 + '\x10d76'# -> unI64 68950 + '\x10d77'# -> unI64 68951 + '\x10d78'# -> unI64 68952 + '\x10d79'# -> unI64 68953 + '\x10d7a'# -> unI64 68954 + '\x10d7b'# -> unI64 68955 + '\x10d7c'# -> unI64 68956 + '\x10d7d'# -> unI64 68957 + '\x10d7e'# -> unI64 68958 + '\x10d7f'# -> unI64 68959 + '\x10d80'# -> unI64 68960 + '\x10d81'# -> unI64 68961 + '\x10d82'# -> unI64 68962 + '\x10d83'# -> unI64 68963 + '\x10d84'# -> unI64 68964 + '\x10d85'# -> unI64 68965 '\x118c0'# -> unI64 71840 '\x118c1'# -> unI64 71841 '\x118c2'# -> unI64 71842 @@ -2243,6 +2270,7 @@ lowerMapping = \case '\x13f3'# -> unI64 5115 '\x13f4'# -> unI64 5116 '\x13f5'# -> unI64 5117 + '\x1c89'# -> unI64 7306 '\x1c90'# -> unI64 4304 '\x1c91'# -> unI64 4305 '\x1c92'# -> unI64 4306 @@ -2791,9 +2819,13 @@ lowerMapping = \case '\xa7c6'# -> unI64 7566 '\xa7c7'# -> unI64 42952 '\xa7c9'# -> unI64 42954 + '\xa7cb'# -> unI64 612 + '\xa7cc'# -> unI64 42957 '\xa7d0'# -> unI64 42961 '\xa7d6'# -> unI64 42967 '\xa7d8'# -> unI64 42969 + '\xa7da'# -> unI64 42971 + '\xa7dc'# -> unI64 411 '\xa7f5'# -> unI64 42998 '\xff21'# -> unI64 65345 '\xff22'# -> unI64 65346 @@ -2983,6 +3015,28 @@ lowerMapping = \case '\x10cb0'# -> unI64 68848 '\x10cb1'# -> unI64 68849 '\x10cb2'# -> unI64 68850 + '\x10d50'# -> unI64 68976 + '\x10d51'# -> unI64 68977 + '\x10d52'# -> unI64 68978 + '\x10d53'# -> unI64 68979 + '\x10d54'# -> unI64 68980 + '\x10d55'# -> unI64 68981 + '\x10d56'# -> unI64 68982 + '\x10d57'# -> unI64 68983 + '\x10d58'# -> unI64 68984 + '\x10d59'# -> unI64 68985 + '\x10d5a'# -> unI64 68986 + '\x10d5b'# -> unI64 68987 + '\x10d5c'# -> unI64 68988 + '\x10d5d'# -> unI64 68989 + '\x10d5e'# -> unI64 68990 + '\x10d5f'# -> unI64 68991 + '\x10d60'# -> unI64 68992 + '\x10d61'# -> unI64 68993 + '\x10d62'# -> unI64 68994 + '\x10d63'# -> unI64 68995 + '\x10d64'# -> unI64 68996 + '\x10d65'# -> unI64 68997 '\x118a0'# -> unI64 71872 '\x118a1'# -> unI64 71873 '\x118a2'# -> unI64 71874 @@ -3311,6 +3365,7 @@ titleMapping = \case '\x0195'# -> unI64 502 '\x0199'# -> unI64 408 '\x019a'# -> unI64 573 + '\x019b'# -> unI64 42972 '\x019e'# -> unI64 544 '\x01a1'# -> unI64 416 '\x01a3'# -> unI64 418 @@ -3401,6 +3456,7 @@ titleMapping = \case '\x0260'# -> unI64 403 '\x0261'# -> unI64 42924 '\x0263'# -> unI64 404 + '\x0264'# -> unI64 42955 '\x0265'# -> unI64 42893 '\x0266'# -> unI64 42922 '\x0268'# -> unI64 407 @@ -3691,6 +3747,7 @@ titleMapping = \case '\x1c86'# -> unI64 1066 '\x1c87'# -> unI64 1122 '\x1c88'# -> unI64 42570 + '\x1c8a'# -> unI64 7305 '\x1d79'# -> unI64 42877 '\x1d7d'# -> unI64 11363 '\x1d8e'# -> unI64 42950 @@ -4214,9 +4271,11 @@ titleMapping = \case '\xa7c3'# -> unI64 42946 '\xa7c8'# -> unI64 42951 '\xa7ca'# -> unI64 42953 + '\xa7cd'# -> unI64 42956 '\xa7d1'# -> unI64 42960 '\xa7d7'# -> unI64 42966 '\xa7d9'# -> unI64 42968 + '\xa7db'# -> unI64 42970 '\xa7f6'# -> unI64 42997 '\xab53'# -> unI64 42931 '\xab70'# -> unI64 5024 @@ -4487,6 +4546,28 @@ titleMapping = \case '\x10cf0'# -> unI64 68784 '\x10cf1'# -> unI64 68785 '\x10cf2'# -> unI64 68786 + '\x10d70'# -> unI64 68944 + '\x10d71'# -> unI64 68945 + '\x10d72'# -> unI64 68946 + '\x10d73'# -> unI64 68947 + '\x10d74'# -> unI64 68948 + '\x10d75'# -> unI64 68949 + '\x10d76'# -> unI64 68950 + '\x10d77'# -> unI64 68951 + '\x10d78'# -> unI64 68952 + '\x10d79'# -> unI64 68953 + '\x10d7a'# -> unI64 68954 + '\x10d7b'# -> unI64 68955 + '\x10d7c'# -> unI64 68956 + '\x10d7d'# -> unI64 68957 + '\x10d7e'# -> unI64 68958 + '\x10d7f'# -> unI64 68959 + '\x10d80'# -> unI64 68960 + '\x10d81'# -> unI64 68961 + '\x10d82'# -> unI64 68962 + '\x10d83'# -> unI64 68963 + '\x10d84'# -> unI64 68964 + '\x10d85'# -> unI64 68965 '\x118c0'# -> unI64 71840 '\x118c1'# -> unI64 71841 '\x118c2'# -> unI64 71842