Skip to content

Commit 26b99e3

Browse files
emilypiemilypi
authored
Merge pull request #7511 from haskell/wip/bump-3.6-into-.3.6
Bump Cabal to 3.6 and regenerate CI
2 parents 9270863 + ff6d146 commit 26b99e3

34 files changed

+942
-911
lines changed

‎.docker/validate-8.10.1.dockerfile renamed to ‎.docker/validate-8.10.4.dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM phadej/ghc:8.10.1-bionic
1+
FROM phadej/ghc:8.10.4-bionic
22

33
# Install cabal-plan
44
RUN mkdir -p /root/.cabal/bin && \
@@ -24,7 +24,7 @@ RUN cabal v2-install happy --constraint 'happy ^>=1.19.12'
2424

2525
# Install some other dependencies
2626
# Remove $HOME/.ghc so there aren't any environments
27-
RUN cabal v2-install -w ghc-8.10.1 --lib \
27+
RUN cabal v2-install -w ghc-8.10.4 --lib \
2828
Cabal \
2929
aeson \
3030
async \
@@ -73,4 +73,4 @@ RUN cabal v2-install -w ghc-8.10.1 --lib \
7373
# Validate
7474
WORKDIR /build
7575
COPY . /build
76-
RUN sh ./validate.sh -w ghc-8.10.1 -v
76+
RUN sh ./validate.sh -w ghc-8.10.4 -v

‎.docker/validate-8.8.3.dockerfile renamed to ‎.docker/validate-8.8.4.dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM phadej/ghc:8.8.3-bionic
1+
FROM phadej/ghc:8.8.4-bionic
22

33
# Install cabal-plan
44
RUN mkdir -p /root/.cabal/bin && \
@@ -24,7 +24,7 @@ RUN cabal v2-install happy --constraint 'happy ^>=1.19.12'
2424

2525
# Install some other dependencies
2626
# Remove $HOME/.ghc so there aren't any environments
27-
RUN cabal v2-install -w ghc-8.8.3 --lib \
27+
RUN cabal v2-install -w ghc-8.8.4 --lib \
2828
Cabal \
2929
aeson \
3030
async \
@@ -73,4 +73,4 @@ RUN cabal v2-install -w ghc-8.8.3 --lib \
7373
# Validate
7474
WORKDIR /build
7575
COPY . /build
76-
RUN sh ./validate.sh --doctest --solver-benchmarks --complete-hackage -w ghc-8.8.3 -v
76+
RUN sh ./validate.sh --doctest --solver-benchmarks --complete-hackage -w ghc-8.8.4 -v

‎.github/workflows/linux.yml

+43-43
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
validate-9_0_1:
1919
name: validate.sh ghc-9.0.1
2020
runs-on: ubuntu-18.04
21-
needs: validate-8_8_3
21+
needs: validate-8_8_4
2222
container:
2323
image: phadej/ghc:9.0.1-bionic
2424
steps:
@@ -57,12 +57,12 @@ jobs:
5757
run: sh validate.sh -j 2 -w ghc-9.0.1 -v --lib-only -s lib-tests
5858
- name: Validate lib-suite
5959
run: sh validate.sh -j 2 -w ghc-9.0.1 -v --lib-only -s lib-suite
60-
validate-8_10_1:
61-
name: validate.sh ghc-8.10.1
60+
validate-8_10_4:
61+
name: validate.sh ghc-8.10.4
6262
runs-on: ubuntu-18.04
63-
needs: validate-8_8_3
63+
needs: validate-8_8_4
6464
container:
65-
image: phadej/ghc:8.10.1-bionic
65+
image: phadej/ghc:8.10.4-bionic
6666
steps:
6767
- name: System info
6868
run: |
@@ -90,26 +90,26 @@ jobs:
9090
git fetch origin $GITHUB_SHA:temporary-ci-branch
9191
git checkout $GITHUB_SHA || (git fetch && git checkout $GITHUB_SHA)
9292
- name: Validate print-config
93-
run: sh validate.sh -j 2 -w ghc-8.10.1 -v -s print-config
93+
run: sh validate.sh -j 2 -w ghc-8.10.4 -v -s print-config
9494
- name: Validate print-tool-versions
95-
run: sh validate.sh -j 2 -w ghc-8.10.1 -v -s print-tool-versions
95+
run: sh validate.sh -j 2 -w ghc-8.10.4 -v -s print-tool-versions
9696
- name: Validate make-cabal-install-dev
97-
run: sh validate.sh -j 2 -w ghc-8.10.1 -v -s make-cabal-install-dev
97+
run: sh validate.sh -j 2 -w ghc-8.10.4 -v -s make-cabal-install-dev
9898
- name: Validate build
99-
run: sh validate.sh -j 2 -w ghc-8.10.1 -v -s build
99+
run: sh validate.sh -j 2 -w ghc-8.10.4 -v -s build
100100
- name: Validate lib-tests
101-
run: sh validate.sh -j 2 -w ghc-8.10.1 -v -s lib-tests
101+
run: sh validate.sh -j 2 -w ghc-8.10.4 -v -s lib-tests
102102
- name: Validate lib-suite
103-
run: sh validate.sh -j 2 -w ghc-8.10.1 -v -s lib-suite
103+
run: sh validate.sh -j 2 -w ghc-8.10.4 -v -s lib-suite
104104
- name: Validate cli-tests
105-
run: sh validate.sh -j 2 -w ghc-8.10.1 -v -s cli-tests
105+
run: sh validate.sh -j 2 -w ghc-8.10.4 -v -s cli-tests
106106
- name: Validate cli-suite
107-
run: sh validate.sh -j 2 -w ghc-8.10.1 -v -s cli-suite
108-
validate-8_8_3:
109-
name: validate.sh ghc-8.8.3
107+
run: sh validate.sh -j 2 -w ghc-8.10.4 -v -s cli-suite
108+
validate-8_8_4:
109+
name: validate.sh ghc-8.8.4
110110
runs-on: ubuntu-18.04
111111
container:
112-
image: phadej/ghc:8.8.3-bionic
112+
image: phadej/ghc:8.8.4-bionic
113113
steps:
114114
- name: System info
115115
run: |
@@ -137,25 +137,25 @@ jobs:
137137
git fetch origin $GITHUB_SHA:temporary-ci-branch
138138
git checkout $GITHUB_SHA || (git fetch && git checkout $GITHUB_SHA)
139139
- name: Validate print-config
140-
run: sh validate.sh -j 2 -w ghc-8.8.3 -v --solver-benchmarks -s print-config
140+
run: sh validate.sh -j 2 -w ghc-8.8.4 -v --solver-benchmarks -s print-config
141141
- name: Validate print-tool-versions
142-
run: sh validate.sh -j 2 -w ghc-8.8.3 -v --solver-benchmarks -s print-tool-versions
142+
run: sh validate.sh -j 2 -w ghc-8.8.4 -v --solver-benchmarks -s print-tool-versions
143143
- name: Validate make-cabal-install-dev
144-
run: sh validate.sh -j 2 -w ghc-8.8.3 -v --solver-benchmarks -s make-cabal-install-dev
144+
run: sh validate.sh -j 2 -w ghc-8.8.4 -v --solver-benchmarks -s make-cabal-install-dev
145145
- name: Validate build
146-
run: sh validate.sh -j 2 -w ghc-8.8.3 -v --solver-benchmarks -s build
146+
run: sh validate.sh -j 2 -w ghc-8.8.4 -v --solver-benchmarks -s build
147147
- name: Validate lib-tests
148-
run: sh validate.sh -j 2 -w ghc-8.8.3 -v --solver-benchmarks -s lib-tests
148+
run: sh validate.sh -j 2 -w ghc-8.8.4 -v --solver-benchmarks -s lib-tests
149149
- name: Validate lib-suite
150-
run: sh validate.sh -j 2 -w ghc-8.8.3 -v --solver-benchmarks -s lib-suite
150+
run: sh validate.sh -j 2 -w ghc-8.8.4 -v --solver-benchmarks -s lib-suite
151151
- name: Validate cli-tests
152-
run: sh validate.sh -j 2 -w ghc-8.8.3 -v --solver-benchmarks -s cli-tests
152+
run: sh validate.sh -j 2 -w ghc-8.8.4 -v --solver-benchmarks -s cli-tests
153153
- name: Validate cli-suite
154-
run: sh validate.sh -j 2 -w ghc-8.8.3 -v --solver-benchmarks -s cli-suite
154+
run: sh validate.sh -j 2 -w ghc-8.8.4 -v --solver-benchmarks -s cli-suite
155155
validate-8_6_5:
156156
name: validate.sh ghc-8.6.5
157157
runs-on: ubuntu-18.04
158-
needs: validate-8_8_3
158+
needs: validate-8_8_4
159159
container:
160160
image: phadej/ghc:8.6.5-bionic
161161
steps:
@@ -203,7 +203,7 @@ jobs:
203203
validate-8_4_4:
204204
name: validate.sh ghc-8.4.4
205205
runs-on: ubuntu-18.04
206-
needs: validate-8_8_3
206+
needs: validate-8_8_4
207207
container:
208208
image: phadej/ghc:8.4.4-bionic
209209
steps:
@@ -251,7 +251,7 @@ jobs:
251251
validate-8_2_2:
252252
name: validate.sh ghc-8.2.2
253253
runs-on: ubuntu-18.04
254-
needs: validate-8_8_3
254+
needs: validate-8_8_4
255255
container:
256256
image: phadej/ghc:8.2.2-bionic
257257
steps:
@@ -299,7 +299,7 @@ jobs:
299299
validate-8_0_2:
300300
name: validate.sh ghc-8.0.2
301301
runs-on: ubuntu-18.04
302-
needs: validate-8_8_3
302+
needs: validate-8_8_4
303303
container:
304304
image: phadej/ghc:8.0.2-bionic
305305
steps:
@@ -347,7 +347,7 @@ jobs:
347347
validate-7_10_3:
348348
name: validate.sh ghc-7.10.3
349349
runs-on: ubuntu-18.04
350-
needs: validate-8_8_3
350+
needs: validate-8_8_4
351351
container:
352352
image: phadej/ghc:7.10.3-bionic
353353
steps:
@@ -395,7 +395,7 @@ jobs:
395395
validate-7_8_4:
396396
name: validate.sh ghc-7.8.4
397397
runs-on: ubuntu-18.04
398-
needs: validate-8_8_3
398+
needs: validate-8_8_4
399399
container:
400400
image: phadej/ghc:7.8.4-bionic
401401
steps:
@@ -437,7 +437,7 @@ jobs:
437437
validate-7_6_3:
438438
name: validate.sh ghc-7.6.3
439439
runs-on: ubuntu-18.04
440-
needs: validate-8_8_3
440+
needs: validate-8_8_4
441441
container:
442442
image: phadej/ghc:7.6.3-xenial
443443
steps:
@@ -480,12 +480,12 @@ jobs:
480480
run: sh validate.sh -j 2 -w ghc-7.6.3 -v --lib-only -s lib-tests
481481
- name: Validate lib-suite
482482
run: sh validate.sh -j 2 -w ghc-7.6.3 -v --lib-only -s lib-suite
483-
validate-8_8_3-old:
483+
validate-8_8_4-old:
484484
name: validate.sh old GHCs
485485
runs-on: ubuntu-18.04
486-
needs: validate-8_8_3
486+
needs: validate-8_8_4
487487
container:
488-
image: phadej/ghc:8.8.3-xenial
488+
image: phadej/ghc:8.8.4-xenial
489489
steps:
490490
- name: System info
491491
run: |
@@ -505,7 +505,7 @@ jobs:
505505
- name: apt-get update
506506
run: apt-get update
507507
- name: Install dynamic libraries
508-
run: apt-get install -y ghc-8.8.3-dyn
508+
run: apt-get install -y ghc-8.8.4-dyn
509509
- name: Install extra compilers
510510
run: apt-get install -y ghc-7.0.4-dyn ghc-7.2.2-dyn ghc-7.4.2-dyn
511511
- name: Update Hackage index
@@ -519,18 +519,18 @@ jobs:
519519
git fetch origin $GITHUB_SHA:temporary-ci-branch
520520
git checkout $GITHUB_SHA || (git fetch && git checkout $GITHUB_SHA)
521521
- name: Validate print-config
522-
run: sh validate.sh -j 2 -w ghc-8.8.3 -v --lib-only -s print-config
522+
run: sh validate.sh -j 2 -w ghc-8.8.4 -v --lib-only -s print-config
523523
- name: Validate print-tool-versions
524-
run: sh validate.sh -j 2 -w ghc-8.8.3 -v --lib-only -s print-tool-versions
524+
run: sh validate.sh -j 2 -w ghc-8.8.4 -v --lib-only -s print-tool-versions
525525
- name: Validate build
526-
run: sh validate.sh -j 2 -w ghc-8.8.3 -v --lib-only -s build
526+
run: sh validate.sh -j 2 -w ghc-8.8.4 -v --lib-only -s build
527527
- name: Validate lib-tests
528-
run: sh validate.sh -j 2 -w ghc-8.8.3 -v --lib-only -s lib-tests
528+
run: sh validate.sh -j 2 -w ghc-8.8.4 -v --lib-only -s lib-tests
529529
- name: Validate lib-suite
530-
run: sh validate.sh -j 2 -w ghc-8.8.3 -v --lib-only -s lib-suite
530+
run: sh validate.sh -j 2 -w ghc-8.8.4 -v --lib-only -s lib-suite
531531
- name: Validate lib-suite-extras --extra-hc /opt/ghc/7.0.4/bin/ghc-7.0.4
532-
run: sh validate.sh -j 2 -w ghc-8.8.3 -v --lib-only -s lib-suite-extras --extra-hc /opt/ghc/7.0.4/bin/ghc-7.0.4
532+
run: sh validate.sh -j 2 -w ghc-8.8.4 -v --lib-only -s lib-suite-extras --extra-hc /opt/ghc/7.0.4/bin/ghc-7.0.4
533533
- name: Validate lib-suite-extras --extra-hc /opt/ghc/7.2.2/bin/ghc-7.2.2
534-
run: sh validate.sh -j 2 -w ghc-8.8.3 -v --lib-only -s lib-suite-extras --extra-hc /opt/ghc/7.2.2/bin/ghc-7.2.2
534+
run: sh validate.sh -j 2 -w ghc-8.8.4 -v --lib-only -s lib-suite-extras --extra-hc /opt/ghc/7.2.2/bin/ghc-7.2.2
535535
- name: Validate lib-suite-extras --extra-hc /opt/ghc/7.4.2/bin/ghc-7.4.2
536-
run: sh validate.sh -j 2 -w ghc-8.8.3 -v --lib-only -s lib-suite-extras --extra-hc /opt/ghc/7.4.2/bin/ghc-7.4.2
536+
run: sh validate.sh -j 2 -w ghc-8.8.4 -v --lib-only -s lib-suite-extras --extra-hc /opt/ghc/7.4.2/bin/ghc-7.4.2

‎.github/workflows/macos.yml

+14-14
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ on:
1515
- created
1616

1717
jobs:
18-
validate-macos-8_8_3:
19-
name: validate.sh macos ghc-8.8.3
18+
validate-macos-8_8_4:
19+
name: validate.sh macos ghc-8.8.4
2020
runs-on: macos-latest
2121
steps:
2222
- name: System info
@@ -28,10 +28,10 @@ jobs:
2828
- name: Install GHC
2929
run: |
3030
cd $(mktemp -d)
31-
curl -sLO https://downloads.haskell.org/~ghc/8.8.3/ghc-8.8.3-x86_64-apple-darwin.tar.xz
31+
curl -sLO https://downloads.haskell.org/~ghc/8.8.4/ghc-8.8.4-x86_64-apple-darwin.tar.xz
3232
tar -xJf ghc-*.tar.xz
3333
cd ghc-*
34-
./configure --prefix=/opt/ghc/8.8.3
34+
./configure --prefix=/opt/ghc/8.8.4
3535
sudo make install
3636
- name: Install Cabal
3737
run: |
@@ -43,7 +43,7 @@ jobs:
4343
sudo chmod 755 /opt/cabal/3.4/bin/cabal
4444
- name: Set PATH
4545
run: |
46-
echo "/opt/ghc/8.8.3/bin" >> $GITHUB_PATH
46+
echo "/opt/ghc/8.8.4/bin" >> $GITHUB_PATH
4747
echo "/opt/cabal/3.4/bin" >> $GITHUB_PATH
4848
echo "$HOME/.cabal/bin" >> $GITHUB_PATH
4949
- name: Update Hackage index
@@ -54,25 +54,25 @@ jobs:
5454
cabal v2-install cabal-plan --constraint='cabal-plan ^>=0.6.2.0' --constraint='aeson +fast' --constraint='cabal-plan +exe'
5555
- uses: actions/checkout@v2
5656
- name: Validate print-config
57-
run: sh validate.sh -j 2 -w ghc-8.8.3 -v -s print-config
57+
run: sh validate.sh -j 2 -w ghc-8.8.4 -v -s print-config
5858
- name: Validate print-tool-versions
59-
run: sh validate.sh -j 2 -w ghc-8.8.3 -v -s print-tool-versions
59+
run: sh validate.sh -j 2 -w ghc-8.8.4 -v -s print-tool-versions
6060
- name: Validate make-cabal-install-dev
61-
run: sh validate.sh -j 2 -w ghc-8.8.3 -v -s make-cabal-install-dev
61+
run: sh validate.sh -j 2 -w ghc-8.8.4 -v -s make-cabal-install-dev
6262
- name: Validate build
63-
run: sh validate.sh -j 2 -w ghc-8.8.3 -v -s build
63+
run: sh validate.sh -j 2 -w ghc-8.8.4 -v -s build
6464
- name: Validate lib-tests
65-
run: sh validate.sh -j 2 -w ghc-8.8.3 -v -s lib-tests
65+
run: sh validate.sh -j 2 -w ghc-8.8.4 -v -s lib-tests
6666
- name: Validate lib-suite
67-
run: sh validate.sh -j 2 -w ghc-8.8.3 -v -s lib-suite
67+
run: sh validate.sh -j 2 -w ghc-8.8.4 -v -s lib-suite
6868
- name: Validate cli-tests
69-
run: sh validate.sh -j 2 -w ghc-8.8.3 -v -s cli-tests
69+
run: sh validate.sh -j 2 -w ghc-8.8.4 -v -s cli-tests
7070
- name: Validate cli-suite
71-
run: sh validate.sh -j 2 -w ghc-8.8.3 -v -s cli-suite
71+
run: sh validate.sh -j 2 -w ghc-8.8.4 -v -s cli-suite
7272
validate-macos-8_6_5:
7373
name: validate.sh macos ghc-8.6.5
7474
runs-on: macos-latest
75-
needs: validate-macos-8_8_3
75+
needs: validate-macos-8_8_4
7676
steps:
7777
- name: System info
7878
run: |

‎.github/workflows/windows.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,14 @@ jobs:
6565
cabal v2-run cabal-install:unit-tests -- --pattern "! (/FileMonitor/ || /VCS/ || /Get/)"
6666
- name: cabal-tests
6767
# Using only one job, -j1, to fail less.
68-
run: cabal v2-run cabal-testsuite:cabal-tests -- -j1 --with-cabal=dist-newstyle\build\x86_64-windows\ghc-8.6.5\cabal-install-3.5.0.0\x\cabal\build\cabal\cabal.exe
69-
test-windows-8_10_3:
70-
name: test ghc-8.10.3
68+
run: cabal v2-run cabal-testsuite:cabal-tests -- -j1 --with-cabal=dist-newstyle\build\x86_64-windows\ghc-8.6.5\cabal-install-3.6.0.0\x\cabal\build\cabal\cabal.exe
69+
test-windows-8_10_4:
70+
name: test ghc-8.10.4
7171
runs-on: windows-latest
7272
steps:
7373
- uses: actions/[email protected]
7474
with:
75-
ghc-version: '8.10.3'
75+
ghc-version: '8.10.4'
7676
cabal-version: '3.2.0.0'
7777
- name: Print versions
7878
run: |
@@ -115,4 +115,4 @@ jobs:
115115
cabal v2-run cabal-install:unit-tests -- --pattern "! (/FileMonitor/ || /VCS/ || /Get/)"
116116
- name: cabal-tests
117117
# Using only one job, -j1, to fail less.
118-
run: cabal v2-run cabal-testsuite:cabal-tests -- -j1 --with-cabal=dist-newstyle\build\x86_64-windows\ghc-8.10.3\cabal-install-3.5.0.0\x\cabal\build\cabal\cabal.exe
118+
run: cabal v2-run cabal-testsuite:cabal-tests -- -j1 --with-cabal=dist-newstyle\build\x86_64-windows\ghc-8.10.4\cabal-install-3.6.0.0\x\cabal\build\cabal\cabal.exe

‎Cabal-QuickCheck/Cabal-QuickCheck.cabal

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 2.2
22
name: Cabal-QuickCheck
3-
version: 3.5.0.0
3+
version: 3.6.0.0
44
synopsis: QuickCheck instances for types in Cabal
55
category: Testing
66
description:
@@ -13,7 +13,7 @@ library
1313
build-depends:
1414
, base
1515
, bytestring
16-
, Cabal ^>=3.5.0.0
16+
, Cabal ^>=3.6.0.0
1717
, QuickCheck ^>=2.13.2 || ^>=2.14
1818

1919
if !impl(ghc >= 8.0)

‎Cabal-described/Cabal-described.cabal

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 2.2
22
name: Cabal-described
3-
version: 3.5.0.0
3+
version: 3.6.0.0
44
synopsis: Described functionality for types in Cabal
55
category: Testing, Parsec
66
description: Provides rere bindings
@@ -11,7 +11,7 @@ library
1111
ghc-options: -Wall
1212
build-depends:
1313
, base
14-
, Cabal ^>=3.5.0.0
14+
, Cabal ^>=3.6.0.0
1515
, containers
1616
, pretty
1717
, QuickCheck

‎Cabal-tests/Cabal-tests.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cabal-version: >=1.10
22
name: Cabal-tests
33
version: 3
4-
copyright: 2003-2020, Cabal Development Team (see AUTHORS file)
4+
copyright: 2003-2021, Cabal Development Team (see AUTHORS file)
55
license: BSD3
66
license-file: LICENSE
77
author: Cabal Development Team <[email protected]>

‎Cabal-tree-diff/Cabal-tree-diff.cabal

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 2.2
22
name: Cabal-tree-diff
3-
version: 3.5.0.0
3+
version: 3.6.0.0
44
synopsis: QuickCheck instances for types in Cabal
55
category: Testing
66
description: Provides tree-diff ToExpr instances for some types in Cabal
@@ -11,7 +11,7 @@ library
1111
ghc-options: -Wall
1212
build-depends:
1313
, base
14-
, Cabal ^>=3.5.0.0
14+
, Cabal ^>=3.6.0.0
1515
, tree-diff ^>=0.1 || ^>=0.2
1616

1717
exposed-modules: Data.TreeDiff.Instances.Cabal

0 commit comments

Comments
 (0)