Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit c758ee5

Browse files
Merge branch 'master' into improve-unknown-module-error
2 parents 9adea75 + f557e6c commit c758ee5

File tree

30 files changed

+402
-434
lines changed

30 files changed

+402
-434
lines changed

‎.cirrus.yml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ build_task:
2121
GITHUB_WORKSPACE: ${CIRRUS_WORKING_DIR}
2222
CABAL_CACHE_NONFATAL: "yes"
2323
matrix:
24-
- name: build-ghc-8.10.7
25-
env:
26-
GHC_VERSION: 8.10.7
2724
- name: build-ghc-9.0.2
2825
env:
2926
GHC_VERSION: 9.0.2
@@ -46,7 +43,6 @@ build_task:
4643
bindist_task:
4744
name: bindist
4845
depends_on:
49-
- build-ghc-8.10.7
5046
- build-ghc-9.0.2
5147
- build-ghc-9.2.5
5248
- build-ghc-9.2.7
@@ -64,10 +60,6 @@ bindist_task:
6460
- tzsetup Etc/GMT
6561
- adjkerntz -a
6662

67-
- curl -o binaries-8.10.7.tar.xz -L https://api.cirrus-ci.com/v1/artifact/build/${CIRRUS_BUILD_ID}/build-ghc-8.10.7/binaries/out.tar.xz
68-
- tar xvf binaries-8.10.7.tar.xz
69-
- rm -f binaries-8.10.7.tar.xz
70-
7163
- curl -o binaries-9.0.2.tar.xz -L https://api.cirrus-ci.com/v1/artifact/build/${CIRRUS_BUILD_ID}/build-ghc-9.0.2/binaries/out.tar.xz
7264
- tar xvf binaries-9.0.2.tar.xz
7365
- rm -f binaries-9.0.2.tar.xz

‎.github/workflows/bench.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
# change of the strategy may require changing the bootstrapping/run code
5757

5858
steps:
59-
- uses: actions/checkout@v3
59+
- uses: actions/checkout@v4
6060
with:
6161

6262
# By default, the `pull_request` event has a `GITHUB_SHA` env variable

‎.github/workflows/caching.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
should_skip: ${{ steps.skip_check.outputs.should_skip }}
5959
steps:
6060
# Need the repo checked out in order to read the file
61-
- uses: actions/checkout@v3
61+
- uses: actions/checkout@v4
6262
- id: ghcs
6363
run: echo "ghcs=$(cat ./.github/workflows/supported-ghc-versions.json)" >> $GITHUB_OUTPUT
6464
- id: skip_check
@@ -91,7 +91,7 @@ jobs:
9191
- macOS-latest
9292
- windows-latest
9393
steps:
94-
- uses: actions/checkout@v3
94+
- uses: actions/checkout@v4
9595

9696
- uses: ./.github/actions/setup-build
9797
with:

‎.github/workflows/flags.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
should_skip: ${{ steps.skip_check.outputs.should_skip }}
2323
steps:
2424
# Need the repo checked out in order to read the file
25-
- uses: actions/checkout@v3
25+
- uses: actions/checkout@v4
2626
- id: ghcs
2727
run: echo "ghcs=$(cat ./.github/workflows/supported-ghc-versions.json)" >> $GITHUB_OUTPUT
2828
- id: skip_check
@@ -54,7 +54,7 @@ jobs:
5454
- ubuntu-latest
5555

5656
steps:
57-
- uses: actions/checkout@v3
57+
- uses: actions/checkout@v4
5858
with:
5959

6060
# By default, the `pull_request` event has a `GITHUB_SHA` env variable

‎.github/workflows/hlint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
name: "Hlint check run"
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414

1515
- name: 'Installing'
1616
uses: rwe/actions-hlint-setup@v1

‎.github/workflows/nix.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ jobs:
5353
os: [ubuntu-latest, macOS-latest]
5454

5555
steps:
56-
- uses: actions/checkout@v3
56+
- uses: actions/checkout@v4
5757

58-
- uses: cachix/install-nix-action@v22
58+
- uses: cachix/install-nix-action@v23
5959
with:
6060
extra_nix_config: |
6161
experimental-features = nix-command flakes
@@ -85,9 +85,9 @@ jobs:
8585
os: [ubuntu-latest, macOS-latest]
8686

8787
steps:
88-
- uses: actions/checkout@v3
88+
- uses: actions/checkout@v4
8989

90-
- uses: cachix/install-nix-action@v22
90+
- uses: cachix/install-nix-action@v23
9191
with:
9292
extra_nix_config: |
9393
experimental-features = nix-command flakes

‎.github/workflows/pre-commit.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
git-diff: ${{ steps.git-diff.outputs.diff }}
1313
steps:
1414
- name: Checkout code
15-
uses: actions/checkout@v3
15+
uses: actions/checkout@v4
1616
- name: Find changed files
1717
uses: technote-space/get-diff-action@v6.1.2
1818
id: git-diff
@@ -23,7 +23,7 @@ jobs:
2323
runs-on: ubuntu-latest
2424
needs: file-diff
2525
steps:
26-
- uses: actions/checkout@v3
26+
- uses: actions/checkout@v4
2727
- uses: ./.github/actions/setup-build
2828
with:
2929
# select a stable GHC version

‎.github/workflows/release.yaml‎

Lines changed: 23 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
strategy:
3131
fail-fast: false
3232
matrix:
33-
ghc: ["9.6.2", "9.4.7", "9.4.6", "9.4.5", "9.2.8", "9.0.2", "8.10.7"]
33+
ghc: ["9.6.2", "9.4.7", "9.2.8", "9.0.2"]
3434
platform: [ { image: "debian:9"
3535
, 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"
3636
, 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"
@@ -118,15 +118,6 @@ jobs:
118118
# Perhaps we can migrate *all* unknown linux builds to a uniform
119119
# image.
120120
include:
121-
- ghc: 8.10.7
122-
platform:
123-
{ image: "rockylinux:8"
124-
, installCmd: "yum -y install epel-release && yum install -y --allowerasing"
125-
, 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"
126-
, DISTRO: "Unknown"
127-
, ARTIFACT: "x86_64-linux-unknown"
128-
, ADD_CABAL_ARGS: "--enable-split-sections"
129-
}
130121
- ghc: 9.0.2
131122
platform:
132123
{ image: "rockylinux:8"
@@ -145,24 +136,6 @@ jobs:
145136
, ARTIFACT: "x86_64-linux-unknown"
146137
, ADD_CABAL_ARGS: "--enable-split-sections"
147138
}
148-
- ghc: 9.4.5
149-
platform:
150-
{ image: "fedora:27"
151-
, installCmd: "dnf install -y"
152-
, 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"
153-
, DISTRO: "Unknown"
154-
, ARTIFACT: "x86_64-linux-unknown"
155-
, ADD_CABAL_ARGS: "--enable-split-sections"
156-
}
157-
- ghc: 9.4.6
158-
platform:
159-
{ image: "fedora:27"
160-
, installCmd: "dnf install -y"
161-
, 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"
162-
, DISTRO: "Unknown"
163-
, ARTIFACT: "x86_64-linux-unknown"
164-
, ADD_CABAL_ARGS: "--enable-split-sections"
165-
}
166139
- ghc: 9.4.7
167140
platform:
168141
{ image: "fedora:27"
@@ -195,7 +168,7 @@ jobs:
195168
echo "ID=linux" >> /etc/os-release
196169
echo "PRETTY_NAME=Linux" >> /etc/os-release
197170
198-
- uses: actions/checkout@v3
171+
- uses: actions/checkout@v4
199172

200173
- name: Run build
201174
run: |
@@ -240,7 +213,7 @@ jobs:
240213
strategy:
241214
fail-fast: true
242215
matrix:
243-
ghc: ["9.6.2", "9.4.7", "9.4.6", "9.4.5", "9.2.8", "9.0.2", "8.10.7"]
216+
ghc: ["9.6.2", "9.4.7", "9.2.8", "9.0.2"]
244217
steps:
245218
- uses: docker://arm64v8/ubuntu:focal
246219
name: Cleanup (aarch64 linux)
@@ -253,7 +226,7 @@ jobs:
253226
shell: bash
254227

255228
- name: Checkout code
256-
uses: actions/checkout@v3
229+
uses: actions/checkout@v4
257230

258231
- uses: docker://hasufell/arm64v8-ubuntu-haskell:focal
259232
name: Run build (aarch64 linux)
@@ -300,10 +273,10 @@ jobs:
300273
strategy:
301274
fail-fast: false
302275
matrix:
303-
ghc: ["9.6.2", "9.4.7", "9.4.6", "9.4.5", "9.2.8", "9.0.2", "8.10.7"]
276+
ghc: ["9.6.2", "9.4.7", "9.2.8", "9.0.2"]
304277
steps:
305278
- name: Checkout code
306-
uses: actions/checkout@v3
279+
uses: actions/checkout@v4
307280

308281
- name: Run build
309282
run: |
@@ -345,26 +318,15 @@ jobs:
345318
strategy:
346319
fail-fast: false
347320
matrix:
348-
ghc: ["9.6.2", "9.4.7", "9.4.6", "9.4.5", "9.2.8", "8.10.7"]
321+
ghc: ["9.6.2", "9.4.7", "9.2.8"]
349322
steps:
350323
- name: Checkout code
351-
uses: actions/checkout@v3
324+
uses: actions/checkout@v4
352325

353326
- name: Run build
354327
run: |
355-
if test "${GHC_VERSION}" = "8.10.7"; then
356-
bash .github/scripts/brew.sh git coreutils llvm@11 autoconf automake tree
357-
export PATH="$HOME/.brew/bin:$HOME/.brew/sbin:$HOME/.brew/opt/llvm@11/bin:$PATH"
358-
export CC="$HOME/.brew/opt/llvm@11/bin/clang"
359-
export CXX="$HOME/.brew/opt/llvm@11/bin/clang++"
360-
export AR="$HOME/.brew/opt/llvm@11/bin/llvm-ar"
361-
export LLC="$HOME/.brew/opt/llvm@11/bin/llc"
362-
export OPT="$HOME/.brew/opt/llvm@11/bin/opt"
363-
export RANLIB="$HOME/.brew/opt/llvm@11/bin/llvm-ranlib"
364-
else
365-
bash .github/scripts/brew.sh git coreutils autoconf automake tree
366-
export PATH="$HOME/.brew/bin:$HOME/.brew/sbin:$PATH"
367-
fi
328+
bash .github/scripts/brew.sh git coreutils autoconf automake tree
329+
export PATH="$HOME/.brew/bin:$HOME/.brew/sbin:$PATH"
368330
export LD=ld
369331
bash .github/scripts/build.sh
370332
tar cf out-${ARTIFACT}-${GHC_VERSION}.tar out/ store/
@@ -401,7 +363,7 @@ jobs:
401363
strategy:
402364
fail-fast: false
403365
matrix:
404-
ghc: ["9.6.2", "9.4.7", "9.4.6", "9.4.5", "9.2.8", "9.0.2", "8.10.7"]
366+
ghc: ["9.6.2", "9.4.7", "9.2.8", "9.0.2"]
405367
steps:
406368
- name: install windows deps
407369
shell: pwsh
@@ -412,7 +374,7 @@ jobs:
412374
taskkill /F /FI "MODULES eq msys-2.0.dll"
413375
414376
- name: Checkout code
415-
uses: actions/checkout@v3
377+
uses: actions/checkout@v4
416378

417379
- name: Run build (windows)
418380
run: |
@@ -521,7 +483,7 @@ jobs:
521483
echo "ID=linux" >> /etc/os-release
522484
echo "PRETTY_NAME=Linux" >> /etc/os-release
523485
524-
- uses: actions/checkout@v3
486+
- uses: actions/checkout@v4
525487

526488
- uses: actions/download-artifact@v3
527489
with:
@@ -573,7 +535,7 @@ jobs:
573535
git config --global --get-all safe.directory | grep '^\*$' || git config --global --add safe.directory "*"
574536
shell: bash
575537

576-
- uses: actions/checkout@v3
538+
- uses: actions/checkout@v4
577539

578540
- uses: actions/download-artifact@v3
579541
with:
@@ -612,7 +574,7 @@ jobs:
612574
ARCH: 64
613575
ARTIFACT: "x86_64-apple-darwin"
614576
steps:
615-
- uses: actions/checkout@v3
577+
- uses: actions/checkout@v4
616578

617579
- uses: actions/download-artifact@v3
618580
with:
@@ -650,7 +612,7 @@ jobs:
650612
ARCH: ARM64
651613
ARTIFACT: "aarch64-apple-darwin"
652614
steps:
653-
- uses: actions/checkout@v3
615+
- uses: actions/checkout@v4
654616

655617
- uses: actions/download-artifact@v3
656618
with:
@@ -702,7 +664,7 @@ jobs:
702664
C:\msys64\usr\bin\bash -lc "pacman --disable-download-timeout --noconfirm -S unzip zip git"
703665
taskkill /F /FI "MODULES eq msys-2.0.dll"
704666
705-
- uses: actions/checkout@v3
667+
- uses: actions/checkout@v4
706668

707669
- uses: actions/download-artifact@v3
708670
with:
@@ -816,7 +778,7 @@ jobs:
816778
echo "ID=linux" >> /etc/os-release
817779
echo "PRETTY_NAME=Linux" >> /etc/os-release
818780
819-
- uses: actions/checkout@v3
781+
- uses: actions/checkout@v4
820782

821783
- uses: actions/download-artifact@v3
822784
with:
@@ -852,7 +814,7 @@ jobs:
852814
shell: bash
853815

854816
- name: Checkout code
855-
uses: actions/checkout@v3
817+
uses: actions/checkout@v4
856818

857819
- uses: actions/download-artifact@v3
858820
with:
@@ -876,7 +838,7 @@ jobs:
876838
DISTRO: na
877839
steps:
878840
- name: Checkout code
879-
uses: actions/checkout@v3
841+
uses: actions/checkout@v4
880842

881843
- uses: actions/download-artifact@v3
882844
with:
@@ -901,7 +863,7 @@ jobs:
901863
HOMEBREW_CHANGE_ARCH_TO_ARM: 1
902864
steps:
903865
- name: Checkout code
904-
uses: actions/checkout@v3
866+
uses: actions/checkout@v4
905867

906868
- uses: actions/download-artifact@v3
907869
with:
@@ -940,7 +902,7 @@ jobs:
940902
taskkill /F /FI "MODULES eq msys-2.0.dll"
941903
942904
- name: Checkout code
943-
uses: actions/checkout@v3
905+
uses: actions/checkout@v4
944906

945907
- uses: actions/download-artifact@v3
946908
with:
@@ -961,7 +923,7 @@ jobs:
961923
if: startsWith(github.ref, 'refs/tags/')
962924
steps:
963925
- name: Checkout code
964-
uses: actions/checkout@v3
926+
uses: actions/checkout@v4
965927

966928
- uses: actions/download-artifact@v3
967929
with:

‎.github/workflows/test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
ghcs: ${{ steps.ghcs.outputs.ghcs }}
2424
steps:
2525
# Need the repo checked out in order to read the file
26-
- uses: actions/checkout@v3
26+
- uses: actions/checkout@v4
2727
- id: ghcs
2828
run: echo "ghcs=$(cat ./.github/workflows/supported-ghc-versions.json)" >> $GITHUB_OUTPUT
2929
- id: skip_check
@@ -83,7 +83,7 @@ jobs:
8383
test: true
8484

8585
steps:
86-
- uses: actions/checkout@v3
86+
- uses: actions/checkout@v4
8787

8888
- uses: ./.github/actions/setup-build
8989
with:

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /