diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index f67a41a0cd7daf5a0029af6c86505fe701e86850..fed53fa27ab239e8b408558240eb6260c71c9b79 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -57,12 +57,12 @@ jobs: run: sh validate.sh -j 2 -w ghc-9.0.1 -v --lib-only -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_1: - name: validate.sh ghc-8.10.1 + validate-8_10_4: + name: validate.sh ghc-8.10.4 runs-on: ubuntu-18.04 needs: validate-8_8_4 container: - image: phadej/ghc:8.10.1-bionic + image: phadej/ghc:8.10.4-bionic steps: - name: System info run: | @@ -90,21 +90,21 @@ 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.1 -v -s print-config + run: sh validate.sh -j 2 -w ghc-8.10.4 -v -s print-config - name: Validate print-tool-versions - run: sh validate.sh -j 2 -w ghc-8.10.1 -v -s print-tool-versions + run: sh validate.sh -j 2 -w ghc-8.10.4 -v -s print-tool-versions - name: Validate make-cabal-install-dev - run: sh validate.sh -j 2 -w ghc-8.10.1 -v -s make-cabal-install-dev + run: sh validate.sh -j 2 -w ghc-8.10.4 -v -s make-cabal-install-dev - name: Validate build - run: sh validate.sh -j 2 -w ghc-8.10.1 -v -s build + run: sh validate.sh -j 2 -w ghc-8.10.4 -v -s build - name: Validate lib-tests - run: sh validate.sh -j 2 -w ghc-8.10.1 -v -s lib-tests + run: sh validate.sh -j 2 -w ghc-8.10.4 -v -s lib-tests - name: Validate lib-suite - run: sh validate.sh -j 2 -w ghc-8.10.1 -v -s lib-suite + run: sh validate.sh -j 2 -w ghc-8.10.4 -v -s lib-suite - name: Validate cli-tests - run: sh validate.sh -j 2 -w ghc-8.10.1 -v -s cli-tests + run: sh validate.sh -j 2 -w ghc-8.10.4 -v -s cli-tests - name: Validate cli-suite - run: sh validate.sh -j 2 -w ghc-8.10.1 -v -s cli-suite + run: sh validate.sh -j 2 -w ghc-8.10.4 -v -s cli-suite validate-8_8_4: name: validate.sh ghc-8.8.4 runs-on: ubuntu-18.04 diff --git a/cabal-dev-scripts/src/GenValidate.hs b/cabal-dev-scripts/src/GenValidate.hs index 305f3ee8b7ed2d86107d2bb651bf64d2a5380de8..d12b999b4ee986169b032d9319fed00d538c248c 100644 --- a/cabal-dev-scripts/src/GenValidate.hs +++ b/cabal-dev-scripts/src/GenValidate.hs @@ -23,7 +23,7 @@ main = do w <- run Z { zJobs = [ GhcJob "9.0.1" False "--lib-only" False ["8.8.4"] libSteps - , GhcJob "8.10.1" False "" False ["8.8.4"] defSteps + , GhcJob "8.10.4" 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