Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gb/build with 9.2 #7907

Closed
wants to merge 8 commits into from
Closed

Gb/build with 9.2 #7907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3cd9b48
build with 9.2
gbaz Jan 13, 2022
ca4c68a
more cleanup
gbaz Jan 13, 2022
b5a121f
rm vendored doctest entirely
gbaz Jan 14, 2022
b64b771
fix validate
gbaz Jan 14, 2022
7ccdcd9
more fixup
gbaz Jan 14, 2022
10ee23d
merge
gbaz Jan 27, 2022
3ea1bdf
Add 9.2 CI job and update older ones
fgaz Jan 27, 2022
106c99a
Switch to official docker images for CI
fgaz Feb 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
112 changes: 85 additions & 27 deletions .github/workflows/linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ on:
- created

jobs:
validate-9_0_1:
name: validate.sh ghc-9.0.1
validate-9_2_1:
name: validate.sh ghc-9.2.1
runs-on: ubuntu-18.04
needs: validate-8_8_4
container:
image: phadej/ghc:9.0.1-bionic
image: haskell:9.2.1
steps:
- name: System info
run: |
Expand All @@ -37,6 +37,60 @@ jobs:
xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan
rm -f cabal-plan.xz
chmod a+x $HOME/.cabal/bin/cabal-plan
- name: apt-get update
run: apt-get update
- name: Install `nroff` for `cabal man`
run: apt-get install -y groff-base
- name: Update Hackage index
run: cabal v2-update
# https://github.com/actions/checkout/issues/170
# - uses: actions/checkout@v2
- name: Checkout
run: |
echo $GITHUB_REF $GITHUB_SHA
git clone --depth 1 https://github.com/$GITHUB_REPOSITORY.git .
git fetch origin $GITHUB_SHA:temporary-ci-branch
git checkout $GITHUB_SHA || (git fetch && git checkout $GITHUB_SHA)
- name: Validate print-config
run: sh validate.sh -j 2 -w ghc-9.2.1 -v -s print-config
- name: Validate print-tool-versions
run: sh validate.sh -j 2 -w ghc-9.2.1 -v -s print-tool-versions
- name: Validate build
run: sh validate.sh -j 2 -w ghc-9.2.1 -v -s build
- name: Validate lib-tests
run: sh validate.sh -j 2 -w ghc-9.2.1 -v -s lib-tests
- name: Validate lib-suite
run: sh validate.sh -j 2 -w ghc-9.2.1 -v -s lib-suite
- name: Validate cli-tests
run: sh validate.sh -j 2 -w ghc-9.2.1 -v -s cli-tests
- name: Validate cli-suite
run: sh validate.sh -j 2 -w ghc-9.2.1 -v -s cli-suite
validate-9_0_2:
name: validate.sh ghc-9.0.2
runs-on: ubuntu-18.04
needs: validate-8_8_4
container:
image: haskell:9.0.2
steps:
- name: System info
run: |
uname -a
- name: Set PATH
# https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-commands-for-github-actions#adding-a-system-path
run: |
echo "$HOME/.cabal/bin" >> $GITHUB_PATH
- name: Install cabal-plan
run: |
mkdir -p $HOME/.cabal/bin
curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.6.2.0/cabal-plan-0.6.2.0-x86_64-linux.xz > cabal-plan.xz
echo "de73600b1836d3f55e32d80385acc055fd97f60eaa0ab68a755302685f5d81bc cabal-plan.xz" | sha256sum -c -
xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan
rm -f cabal-plan.xz
chmod a+x $HOME/.cabal/bin/cabal-plan
- name: apt-get update
run: apt-get update
- name: Install `nroff` for `cabal man`
run: apt-get install -y groff-base
- name: Update Hackage index
run: cabal v2-update
# https://github.com/actions/checkout/issues/170
Expand All @@ -48,21 +102,25 @@ jobs:
git fetch origin $GITHUB_SHA:temporary-ci-branch
git checkout $GITHUB_SHA || (git fetch && git checkout $GITHUB_SHA)
- name: Validate print-config
run: sh validate.sh -j 2 -w ghc-9.0.1 -v --lib-only -s print-config
run: sh validate.sh -j 2 -w ghc-9.0.2 -v -s print-config
- name: Validate print-tool-versions
run: sh validate.sh -j 2 -w ghc-9.0.1 -v --lib-only -s print-tool-versions
run: sh validate.sh -j 2 -w ghc-9.0.2 -v -s print-tool-versions
- name: Validate build
run: sh validate.sh -j 2 -w ghc-9.0.1 -v --lib-only -s build
run: sh validate.sh -j 2 -w ghc-9.0.2 -v -s build
- name: Validate lib-tests
run: sh validate.sh -j 2 -w ghc-9.0.1 -v --lib-only -s lib-tests
run: sh validate.sh -j 2 -w ghc-9.0.2 -v -s lib-tests
- name: Validate lib-suite
run: sh validate.sh -j 2 -w ghc-9.0.1 -v --lib-only -s lib-suite
validate-8_10_4:
name: validate.sh ghc-8.10.4
run: sh validate.sh -j 2 -w ghc-9.0.2 -v -s lib-suite
- name: Validate cli-tests
run: sh validate.sh -j 2 -w ghc-9.0.2 -v -s cli-tests
- name: Validate cli-suite
run: sh validate.sh -j 2 -w ghc-9.0.2 -v -s cli-suite
validate-8_10_7:
name: validate.sh ghc-8.10.7
runs-on: ubuntu-18.04
needs: validate-8_8_4
container:
image: phadej/ghc:8.10.4-bionic
image: haskell:8.10.7
steps:
- name: System info
run: |
Expand Down Expand Up @@ -94,24 +152,24 @@ jobs:
git fetch origin $GITHUB_SHA:temporary-ci-branch
git checkout $GITHUB_SHA || (git fetch && git checkout $GITHUB_SHA)
- name: Validate print-config
run: sh validate.sh -j 2 -w ghc-8.10.4 -v -s print-config
run: sh validate.sh -j 2 -w ghc-8.10.7 -v -s print-config
- name: Validate print-tool-versions
run: sh validate.sh -j 2 -w ghc-8.10.4 -v -s print-tool-versions
run: sh validate.sh -j 2 -w ghc-8.10.7 -v -s print-tool-versions
- name: Validate build
run: sh validate.sh -j 2 -w ghc-8.10.4 -v -s build
run: sh validate.sh -j 2 -w ghc-8.10.7 -v -s build
- name: Validate lib-tests
run: sh validate.sh -j 2 -w ghc-8.10.4 -v -s lib-tests
run: sh validate.sh -j 2 -w ghc-8.10.7 -v -s lib-tests
- name: Validate lib-suite
run: sh validate.sh -j 2 -w ghc-8.10.4 -v -s lib-suite
run: sh validate.sh -j 2 -w ghc-8.10.7 -v -s lib-suite
- name: Validate cli-tests
run: sh validate.sh -j 2 -w ghc-8.10.4 -v -s cli-tests
run: sh validate.sh -j 2 -w ghc-8.10.7 -v -s cli-tests
- name: Validate cli-suite
run: sh validate.sh -j 2 -w ghc-8.10.4 -v -s cli-suite
run: sh validate.sh -j 2 -w ghc-8.10.7 -v -s cli-suite
validate-8_8_4:
name: validate.sh ghc-8.8.4
runs-on: ubuntu-18.04
container:
image: phadej/ghc:8.8.4-bionic
image: haskell:8.8.4
steps:
- name: System info
run: |
Expand Down Expand Up @@ -161,7 +219,7 @@ jobs:
runs-on: ubuntu-18.04
needs: validate-8_8_4
container:
image: phadej/ghc:8.6.5-bionic
image: haskell:8.6.5
steps:
- name: System info
run: |
Expand Down Expand Up @@ -211,7 +269,7 @@ jobs:
runs-on: ubuntu-18.04
needs: validate-8_8_4
container:
image: phadej/ghc:8.4.4-bionic
image: haskell:8.4.4
steps:
- name: System info
run: |
Expand Down Expand Up @@ -261,7 +319,7 @@ jobs:
runs-on: ubuntu-18.04
needs: validate-8_8_4
container:
image: phadej/ghc:8.2.2-bionic
image: haskell:8.2.2
steps:
- name: System info
run: |
Expand Down Expand Up @@ -311,7 +369,7 @@ jobs:
runs-on: ubuntu-18.04
needs: validate-8_8_4
container:
image: phadej/ghc:8.0.2-bionic
image: haskell:8.0.2
steps:
- name: System info
run: |
Expand Down Expand Up @@ -353,7 +411,7 @@ jobs:
runs-on: ubuntu-18.04
needs: validate-8_8_4
container:
image: phadej/ghc:7.10.3-bionic
image: haskell:7.10.3
steps:
- name: System info
run: |
Expand Down Expand Up @@ -395,7 +453,7 @@ jobs:
runs-on: ubuntu-18.04
needs: validate-8_8_4
container:
image: phadej/ghc:7.8.4-bionic
image: haskell:7.8.4
steps:
- name: System info
run: |
Expand Down Expand Up @@ -437,7 +495,7 @@ jobs:
runs-on: ubuntu-18.04
needs: validate-8_8_4
container:
image: phadej/ghc:7.6.3-xenial
image: haskell:7.6.3
steps:
- name: System info
run: |
Expand Down Expand Up @@ -483,7 +541,7 @@ jobs:
runs-on: ubuntu-18.04
needs: validate-8_8_4
container:
image: phadej/ghc:8.8.4-xenial
image: haskell:8.8.4
steps:
- name: System info
run: |
Expand Down
5 changes: 3 additions & 2 deletions cabal-dev-scripts/src/GenValidate.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@ main = do
w <- run Z
{ zJobs = -- version xenial flags old needs steps
-------------------------------------------------------------------
[ GhcJob "9.0.1" False "--lib-only" False ["8.8.4"] libSteps
, GhcJob "8.10.4" False "" False ["8.8.4"] defSteps
[ GhcJob "9.2.1" False "" False ["8.8.4"] defSteps
, GhcJob "9.0.2" False "" False ["8.8.4"] defSteps
, GhcJob "8.10.7" False "" False ["8.8.4"] defSteps
, GhcJob "8.8.4" False "--solver-benchmarks" False [] defSteps
, GhcJob "8.6.5" False "--complete-hackage-tests" False ["8.8.4"] defSteps
, GhcJob "8.4.4" False "" False ["8.8.4"] defSteps
Expand Down
4 changes: 2 additions & 2 deletions cabal-install-solver/cabal-install-solver.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ library

build-depends:
, array >=0.4 && <0.6
, base >=4.10 && <4.15
, base >=4.10 && <4.17
, binary >=0.7.3 && <0.9
, bytestring >=0.10.6.0 && <0.12
, Cabal ^>=3.7
Expand Down Expand Up @@ -137,7 +137,7 @@ Test-Suite unit-tests
UnitTests.Distribution.Solver.Modular.MessageUtils

build-depends:
, base >= 4.10 && <4.15
, base >= 4.10 && <4.17
, Cabal
, Cabal-syntax
, cabal-install-solver
Expand Down
6 changes: 3 additions & 3 deletions cabal-install/cabal-install.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ common warnings
ghc-options: -Wunused-packages

common base-dep
build-depends: base >=4.10 && <4.16
build-depends: base >=4.10 && <4.17

common cabal-dep
build-depends: Cabal ^>=3.7
Expand Down Expand Up @@ -319,7 +319,7 @@ Test-Suite unit-tests
directory,
filepath,
mtl,
network-uri >= 2.6.2.0 && <2.6.4.0,
network-uri >= 2.6.2.0 && <2.7,
random,
tar,
time,
Expand Down Expand Up @@ -406,7 +406,7 @@ test-suite long-tests
filepath,
hashable,
mtl,
network-uri >= 2.6.2.0 && <2.6.4.0,
network-uri >= 2.6.2.0 && <2.7,
random,
tagged,
tasty >= 1.2.3 && <1.5,
Expand Down
6 changes: 3 additions & 3 deletions cabal-install/tests/IntegrationTests2.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@ mkTargetAllPackages = TargetAllPackages Nothing

instance IsString PackageIdentifier where
fromString pkgidstr = pkgid
where pkgid = fromMaybe (error $"fromString @PackageIdentifier " ++ show pkgidstr) $ simpleParse pkgidstr
where pkgid = fromMaybe (error $ "fromString @PackageIdentifier " ++ show pkgidstr) $ simpleParse pkgidstr


testTargetSelectorNoCurrentPackage :: Assertion
Expand Down Expand Up @@ -1611,8 +1611,8 @@ type PlanDetails = (ProjDetails,
planProject :: FilePath -> ProjectConfig -> IO PlanDetails
planProject testdir cliConfig = do

projDetails@
(distDirLayout,
projDetails@(
distDirLayout,
cabalDirLayout,
projectConfig,
localPackages,
Expand Down
4 changes: 2 additions & 2 deletions cabal-testsuite/cabal-testsuite.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ common shared
default-language: Haskell2010

build-depends:
, base >= 4.6 && <4.16
, base >= 4.6 && <4.17
-- this needs to match the in-tree lib:Cabal version
, Cabal == 3.7.0.0
, Cabal-syntax == 3.7.0.0
Expand Down Expand Up @@ -57,7 +57,7 @@ library
Test.Cabal.ScriptEnv0

build-depends:
, aeson ^>= 1.4.2.0 || ^>=1.5.0.0
, aeson ^>= 1.4.2.0 || ^>=1.5.0.0 || ^>= 2.0.0.0
, async ^>= 2.2.1
, attoparsec ^>= 0.13.2.2 || ^>=0.14.1
, base16-bytestring ^>= 0.1.1.6 || ^>= 1.0.0.0
Expand Down
9 changes: 0 additions & 9 deletions cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,11 @@ packages: Cabal-described
packages: Cabal-tests/
packages: cabal-benchmarks/

packages: vendor/cabal-doctest-1.0.8

optional-packages: ./vendored/*/*.cabal

-- Remove after hackage-repo-tool release
allow-newer:
hackage-repo-tool:optparse-applicative

allow-newer:
hackage-security:Cabal

-- https://github.com/haskell-hvr/windns/pull/2
allow-newer: windns-0.1.0.1:base

-- avoiding extra dependencies
constraints: rere -rere-cfg
constraints: these -assoc
Expand Down
2 changes: 0 additions & 2 deletions cabal.project.coverage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ packages: Cabal-described
packages: Cabal-tests/
packages: cabal-benchmarks/

packages: vendor/cabal-doctest-1.0.8

-- Uncomment to allow picking up extra local unpacked deps:
--optional-packages: */

Expand Down
2 changes: 0 additions & 2 deletions cabal.project.libonly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ packages: Cabal-tree-diff
packages: Cabal-described
packages: Cabal-tests

packages: vendor/cabal-doctest-1.0.8

tests: True

-- Uncomment to allow picking up extra local unpacked deps:
Expand Down
2 changes: 0 additions & 2 deletions cabal.project.validate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ packages: Cabal-described
packages: Cabal-tests
packages: cabal-benchmarks

packages: vendor/cabal-doctest-1.0.8

tests: True

-- avoiding extra dependencies
Expand Down
2 changes: 0 additions & 2 deletions cabal.project.validate.libonly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ packages: Cabal-tree-diff
packages: Cabal-described
packages: Cabal-tests

packages: vendor/cabal-doctest-1.0.8

tests: True

write-ghc-environment-files: never
Expand Down
2 changes: 1 addition & 1 deletion templates/ci-linux.template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
needs: validate-{{ mangleVersion needs }}
{% endfor %}
container:
image: phadej/ghc:{{job.version}}-{% if job.xenial %}xenial{% else %}bionic{% endif %}
image: haskell:{{job.version}}
steps:
- name: System info
run: |
Expand Down
Loading