diff --git a/.github/workflows/artifacts.yml b/.github/workflows/artifacts.yml index 4ff11b2598a..5064cf67775 100644 --- a/.github/workflows/artifacts.yml +++ b/.github/workflows/artifacts.yml @@ -24,7 +24,7 @@ jobs: echo "::add-path::$HOME/.cabal/bin" - name: Update Hackage index run: cabal v2-update - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Release project run: | cp cabal.project.release cabal.project @@ -70,7 +70,7 @@ jobs: echo "::add-path::$HOME/.cabal/bin" - name: Update Hackage index run: cabal v2-update - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Release project run: | cp cabal.project.release cabal.project @@ -114,7 +114,7 @@ jobs: cabal user-config init -a "http-transport: plain-http" -a "store-dir: C:\SR" -f -v3 - name: Update Hackage index run: cabal v2-update - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Release project shell: bash run: | diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml index a1fd2559917..ce62fb4dbef 100644 --- a/.github/workflows/bootstrap.yml +++ b/.github/workflows/bootstrap.yml @@ -25,7 +25,7 @@ jobs: - name: Set PATH run: | echo "::add-path::/opt/ghc/8.6.5/bin" - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: bootstrap.sh env: EXTRA_CONFIGURE_OPTS: "" @@ -52,7 +52,7 @@ jobs: run: | echo "::add-path::/opt/ghc/8.6.5/bin" echo "::add-path::$HOME/.cabal/bin" - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: bootstrap.sh env: EXTRA_CONFIGURE_OPTS: "" diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 3b0927fa19b..1f4766c6089 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -18,11 +18,11 @@ on: - created jobs: - validate-8_8_2: - name: validate.sh ghc-8.8.2 + validate-8_8_3: + name: validate.sh ghc-8.8.3 runs-on: ubuntu-18.04 container: - image: phadej/ghc:8.8.2-bionic + image: phadej/ghc:8.8.3-bionic steps: # https://help.github.com/en/actions/automating-your-workflow-with-github-actions/development-tools-for-github-actions#add-a-system-path-add-path - name: Set PATH @@ -38,64 +38,27 @@ jobs: chmod a+x $HOME/.cabal/bin/cabal-plan - name: Update Hackage index run: cabal v2-update - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Validate print-config - run: sh validate.sh -j 2 -w ghc-8.8.2 -v --solver-benchmarks -s print-config + run: sh validate.sh -j 2 -w ghc-8.8.3 -v --solver-benchmarks -s print-config - name: Validate print-tool-versions - run: sh validate.sh -j 2 -w ghc-8.8.2 -v --solver-benchmarks -s print-tool-versions + run: sh validate.sh -j 2 -w ghc-8.8.3 -v --solver-benchmarks -s print-tool-versions - name: Validate make-cabal-install-dev - run: sh validate.sh -j 2 -w ghc-8.8.2 -v --solver-benchmarks -s make-cabal-install-dev + run: sh validate.sh -j 2 -w ghc-8.8.3 -v --solver-benchmarks -s make-cabal-install-dev - name: Validate build - run: sh validate.sh -j 2 -w ghc-8.8.2 -v --solver-benchmarks -s build + run: sh validate.sh -j 2 -w ghc-8.8.3 -v --solver-benchmarks -s build - name: Validate lib-tests - run: sh validate.sh -j 2 -w ghc-8.8.2 -v --solver-benchmarks -s lib-tests + run: sh validate.sh -j 2 -w ghc-8.8.3 -v --solver-benchmarks -s lib-tests - name: Validate lib-suite - run: sh validate.sh -j 2 -w ghc-8.8.2 -v --solver-benchmarks -s lib-suite + run: sh validate.sh -j 2 -w ghc-8.8.3 -v --solver-benchmarks -s lib-suite - name: Validate cli-tests - run: sh validate.sh -j 2 -w ghc-8.8.2 -v --solver-benchmarks -s cli-tests + run: sh validate.sh -j 2 -w ghc-8.8.3 -v --solver-benchmarks -s cli-tests - name: Validate cli-suite - run: sh validate.sh -j 2 -w ghc-8.8.2 -v --solver-benchmarks -s cli-suite - validate-8_8_1: - name: validate.sh ghc-8.8.1 - runs-on: ubuntu-18.04 - container: - image: phadej/ghc:8.8.1-bionic - steps: - # https://help.github.com/en/actions/automating-your-workflow-with-github-actions/development-tools-for-github-actions#add-a-system-path-add-path - - name: Set PATH - run: | - echo "::add-path::$HOME/.cabal/bin" - - 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: Update Hackage index - run: cabal v2-update - - uses: actions/checkout@v1 - - name: Validate print-config - run: sh validate.sh -j 2 -w ghc-8.8.1 -v --solver-benchmarks -s print-config - - name: Validate print-tool-versions - run: sh validate.sh -j 2 -w ghc-8.8.1 -v --solver-benchmarks -s print-tool-versions - - name: Validate make-cabal-install-dev - run: sh validate.sh -j 2 -w ghc-8.8.1 -v --solver-benchmarks -s make-cabal-install-dev - - name: Validate build - run: sh validate.sh -j 2 -w ghc-8.8.1 -v --solver-benchmarks -s build - - name: Validate lib-tests - run: sh validate.sh -j 2 -w ghc-8.8.1 -v --solver-benchmarks -s lib-tests - - name: Validate lib-suite - run: sh validate.sh -j 2 -w ghc-8.8.1 -v --solver-benchmarks -s lib-suite - - name: Validate cli-tests - run: sh validate.sh -j 2 -w ghc-8.8.1 -v --solver-benchmarks -s cli-tests - - name: Validate cli-suite - run: sh validate.sh -j 2 -w ghc-8.8.1 -v --solver-benchmarks -s cli-suite + run: sh validate.sh -j 2 -w ghc-8.8.3 -v --solver-benchmarks -s cli-suite validate-8_6_5: name: validate.sh ghc-8.6.5 runs-on: ubuntu-18.04 - needs: validate-8_8_1 + needs: validate-8_8_3 container: image: phadej/ghc:8.6.5-bionic steps: @@ -113,7 +76,7 @@ jobs: chmod a+x $HOME/.cabal/bin/cabal-plan - name: Update Hackage index run: cabal v2-update - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Validate print-config run: sh validate.sh -j 2 -w ghc-8.6.5 -v -s print-config - name: Validate print-tool-versions @@ -133,7 +96,7 @@ jobs: validate-8_4_4: name: validate.sh ghc-8.4.4 runs-on: ubuntu-18.04 - needs: validate-8_8_1 + needs: validate-8_8_3 container: image: phadej/ghc:8.4.4-bionic steps: @@ -151,7 +114,7 @@ jobs: chmod a+x $HOME/.cabal/bin/cabal-plan - name: Update Hackage index run: cabal v2-update - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Validate print-config run: sh validate.sh -j 2 -w ghc-8.4.4 -v -s print-config - name: Validate print-tool-versions @@ -171,7 +134,7 @@ jobs: validate-8_2_2: name: validate.sh ghc-8.2.2 runs-on: ubuntu-18.04 - needs: validate-8_8_1 + needs: validate-8_8_3 container: image: phadej/ghc:8.2.2-bionic steps: @@ -189,7 +152,7 @@ jobs: chmod a+x $HOME/.cabal/bin/cabal-plan - name: Update Hackage index run: cabal v2-update - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Validate print-config run: sh validate.sh -j 2 -w ghc-8.2.2 -v -s print-config - name: Validate print-tool-versions @@ -209,7 +172,7 @@ jobs: validate-8_0_2: name: validate.sh ghc-8.0.2 runs-on: ubuntu-18.04 - needs: validate-8_8_1 + needs: validate-8_8_3 container: image: phadej/ghc:8.0.2-bionic steps: @@ -227,7 +190,7 @@ jobs: chmod a+x $HOME/.cabal/bin/cabal-plan - name: Update Hackage index run: cabal v2-update - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Validate print-config run: sh validate.sh -j 2 -w ghc-8.0.2 -v -s print-config - name: Validate print-tool-versions @@ -247,7 +210,7 @@ jobs: validate-7_10_3: name: validate.sh ghc-7.10.3 runs-on: ubuntu-18.04 - needs: validate-8_8_1 + needs: validate-8_8_3 container: image: phadej/ghc:7.10.3-bionic steps: @@ -265,7 +228,7 @@ jobs: chmod a+x $HOME/.cabal/bin/cabal-plan - name: Update Hackage index run: cabal v2-update - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Validate print-config run: sh validate.sh -j 2 -w ghc-7.10.3 -v -s print-config - name: Validate print-tool-versions @@ -285,7 +248,7 @@ jobs: validate-7_8_4: name: validate.sh ghc-7.8.4 runs-on: ubuntu-18.04 - needs: validate-8_8_1 + needs: validate-8_8_3 container: image: phadej/ghc:7.8.4-bionic steps: @@ -303,7 +266,7 @@ jobs: chmod a+x $HOME/.cabal/bin/cabal-plan - name: Update Hackage index run: cabal v2-update - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Validate print-config run: sh validate.sh -j 2 -w ghc-7.8.4 -v --lib-only -s print-config - name: Validate print-tool-versions @@ -317,7 +280,7 @@ jobs: validate-7_6_3: name: validate.sh ghc-7.6.3 runs-on: ubuntu-18.04 - needs: validate-8_8_1 + needs: validate-8_8_3 container: image: phadej/ghc:7.6.3-xenial steps: @@ -339,7 +302,7 @@ jobs: run: apt-get install -y ghc-7.6.3-dyn - name: Update Hackage index run: cabal v2-update - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Validate print-config run: sh validate.sh -j 2 -w ghc-7.6.3 -v --lib-only -s print-config - name: Validate print-tool-versions @@ -350,12 +313,12 @@ jobs: run: sh validate.sh -j 2 -w ghc-7.6.3 -v --lib-only -s lib-tests - name: Validate lib-suite run: sh validate.sh -j 2 -w ghc-7.6.3 -v --lib-only -s lib-suite - validate-8_8_1-old: + validate-8_8_3-old: name: validate.sh old GHCs runs-on: ubuntu-18.04 - needs: validate-8_8_1 + needs: validate-8_8_3 container: - image: phadej/ghc:8.8.1-xenial + image: phadej/ghc:8.8.3-xenial steps: # https://help.github.com/en/actions/automating-your-workflow-with-github-actions/development-tools-for-github-actions#add-a-system-path-add-path - name: Set PATH @@ -372,25 +335,25 @@ jobs: - name: apt-get update run: apt-get update - name: Install dynamic libraries - run: apt-get install -y ghc-8.8.1-dyn + run: apt-get install -y ghc-8.8.3-dyn - name: Install extra compilers run: apt-get install -y ghc-7.0.4-dyn ghc-7.2.2-dyn ghc-7.4.2-dyn - name: Update Hackage index run: cabal v2-update - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Validate print-config - run: sh validate.sh -j 2 -w ghc-8.8.1 -v --lib-only -s print-config + run: sh validate.sh -j 2 -w ghc-8.8.3 -v --lib-only -s print-config - name: Validate print-tool-versions - run: sh validate.sh -j 2 -w ghc-8.8.1 -v --lib-only -s print-tool-versions + run: sh validate.sh -j 2 -w ghc-8.8.3 -v --lib-only -s print-tool-versions - name: Validate build - run: sh validate.sh -j 2 -w ghc-8.8.1 -v --lib-only -s build + run: sh validate.sh -j 2 -w ghc-8.8.3 -v --lib-only -s build - name: Validate lib-tests - run: sh validate.sh -j 2 -w ghc-8.8.1 -v --lib-only -s lib-tests + run: sh validate.sh -j 2 -w ghc-8.8.3 -v --lib-only -s lib-tests - name: Validate lib-suite - run: sh validate.sh -j 2 -w ghc-8.8.1 -v --lib-only -s lib-suite + run: sh validate.sh -j 2 -w ghc-8.8.3 -v --lib-only -s lib-suite - name: Validate lib-suite-extras --extra-hc /opt/ghc/7.0.4/bin/ghc-7.0.4 - run: sh validate.sh -j 2 -w ghc-8.8.1 -v --lib-only -s lib-suite-extras --extra-hc /opt/ghc/7.0.4/bin/ghc-7.0.4 + 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 - name: Validate lib-suite-extras --extra-hc /opt/ghc/7.2.2/bin/ghc-7.2.2 - run: sh validate.sh -j 2 -w ghc-8.8.1 -v --lib-only -s lib-suite-extras --extra-hc /opt/ghc/7.2.2/bin/ghc-7.2.2 + 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 - name: Validate lib-suite-extras --extra-hc /opt/ghc/7.4.2/bin/ghc-7.4.2 - run: sh validate.sh -j 2 -w ghc-8.8.1 -v --lib-only -s lib-suite-extras --extra-hc /opt/ghc/7.4.2/bin/ghc-7.4.2 + 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 diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 75d235a74b7..56d84a82519 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -18,8 +18,8 @@ on: - created jobs: - validate-macos-8_8_1: - name: validate.sh ghc-8.8.1 + validate-macos-8_8_3: + name: validate.sh ghc-8.8.3 runs-on: macos-latest steps: - name: Install Autotools @@ -28,10 +28,10 @@ jobs: - name: Install GHC run: | cd $(mktemp -d) - curl -sLO https://downloads.haskell.org/~ghc/8.8.1/ghc-8.8.1-x86_64-apple-darwin.tar.xz + curl -sLO https://downloads.haskell.org/~ghc/8.8.3/ghc-8.8.3-x86_64-apple-darwin.tar.xz tar -xJf ghc-*.tar.xz cd ghc-* - ./configure --prefix=/opt/ghc/8.8.1 + ./configure --prefix=/opt/ghc/8.8.3 sudo make install - name: Install Cabal run: | @@ -43,7 +43,7 @@ jobs: sudo chmod 755 /opt/cabal/3.0/bin/cabal - name: Set PATH run: | - echo "::add-path::/opt/ghc/8.8.1/bin" + echo "::add-path::/opt/ghc/8.8.3/bin" echo "::add-path::/opt/cabal/3.0/bin" echo "::add-path::$HOME/.cabal/bin" - name: Update Hackage index @@ -52,27 +52,78 @@ jobs: run: | cd $(mktemp -d) cabal v2-install cabal-plan --constraint='cabal-plan ^>=0.6.2.0' --constraint='aeson +fast' - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Validate print-config - run: sh validate.sh -j 2 -w ghc-8.8.1 -v -s print-config + run: sh validate.sh -j 2 -w ghc-8.8.3 -v -s print-config - name: Validate print-tool-versions - run: sh validate.sh -j 2 -w ghc-8.8.1 -v -s print-tool-versions + run: sh validate.sh -j 2 -w ghc-8.8.3 -v -s print-tool-versions - name: Validate make-cabal-install-dev - run: sh validate.sh -j 2 -w ghc-8.8.1 -v -s make-cabal-install-dev + run: sh validate.sh -j 2 -w ghc-8.8.3 -v -s make-cabal-install-dev - name: Validate build - run: sh validate.sh -j 2 -w ghc-8.8.1 -v -s build + run: sh validate.sh -j 2 -w ghc-8.8.3 -v -s build - name: Validate lib-tests - run: sh validate.sh -j 2 -w ghc-8.8.1 -v -s lib-tests + run: sh validate.sh -j 2 -w ghc-8.8.3 -v -s lib-tests - name: Validate lib-suite - run: sh validate.sh -j 2 -w ghc-8.8.1 -v -s lib-suite + run: sh validate.sh -j 2 -w ghc-8.8.3 -v -s lib-suite - name: Validate cli-tests - run: sh validate.sh -j 2 -w ghc-8.8.1 -v -s cli-tests + run: sh validate.sh -j 2 -w ghc-8.8.3 -v -s cli-tests - name: Validate cli-suite - run: sh validate.sh -j 2 -w ghc-8.8.1 -v -s cli-suite + run: sh validate.sh -j 2 -w ghc-8.8.3 -v -s cli-suite + validate-macos-8_8_2: + name: validate.sh ghc-8.8.2 + runs-on: macos-latest + steps: + - name: Install Autotools + run: | + brew install automake + - name: Install GHC + run: | + cd $(mktemp -d) + curl -sLO https://downloads.haskell.org/~ghc/8.8.2/ghc-8.8.2-x86_64-apple-darwin.tar.xz + tar -xJf ghc-*.tar.xz + cd ghc-* + ./configure --prefix=/opt/ghc/8.8.2 + sudo make install + - name: Install Cabal + run: | + cd $(mktemp -d) + curl -sLO https://downloads.haskell.org/~cabal/cabal-install-3.0.0.0/cabal-install-3.0.0.0-x86_64-apple-darwin17.7.0.tar.xz + tar -xJf cabal-install-*.tar.xz + sudo mkdir -p /opt/cabal/3.0/bin + sudo cp cabal /opt/cabal/3.0/bin/cabal + sudo chmod 755 /opt/cabal/3.0/bin/cabal + - name: Set PATH + run: | + echo "::add-path::/opt/ghc/8.8.2/bin" + echo "::add-path::/opt/cabal/3.0/bin" + echo "::add-path::$HOME/.cabal/bin" + - name: Update Hackage index + run: cabal v2-update + - name: Install cabal-plan + run: | + cd $(mktemp -d) + cabal v2-install cabal-plan --constraint='cabal-plan ^>=0.6.2.0' --constraint='aeson +fast' + - uses: actions/checkout@v2 + - name: Validate print-config + run: sh validate.sh -j 2 -w ghc-8.8.2 -v -s print-config + - name: Validate print-tool-versions + run: sh validate.sh -j 2 -w ghc-8.8.2 -v -s print-tool-versions + - name: Validate make-cabal-install-dev + run: sh validate.sh -j 2 -w ghc-8.8.2 -v -s make-cabal-install-dev + - name: Validate build + run: sh validate.sh -j 2 -w ghc-8.8.2 -v -s build + - name: Validate lib-tests + run: sh validate.sh -j 2 -w ghc-8.8.2 -v -s lib-tests + - name: Validate lib-suite + run: sh validate.sh -j 2 -w ghc-8.8.2 -v -s lib-suite + - name: Validate cli-tests + run: sh validate.sh -j 2 -w ghc-8.8.2 -v -s cli-tests + - name: Validate cli-suite + run: sh validate.sh -j 2 -w ghc-8.8.2 -v -s cli-suite validate-macos-8_6_5: name: validate.sh ghc-8.6.5 runs-on: macos-latest - needs: validate-macos-8_8_1 + needs: validate-macos-8_8_2 steps: - name: Install Autotools run: | @@ -104,7 +155,7 @@ jobs: run: | cd $(mktemp -d) cabal v2-install cabal-plan --constraint='cabal-plan ^>=0.6.2.0' --constraint='aeson +fast' - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Validate print-config run: sh validate.sh -j 2 -w ghc-8.6.5 -v -s print-config - name: Validate print-tool-versions diff --git a/.github/workflows/quick-jobs.yml b/.github/workflows/quick-jobs.yml index afaa63e646b..d53658c575e 100644 --- a/.github/workflows/quick-jobs.yml +++ b/.github/workflows/quick-jobs.yml @@ -36,7 +36,7 @@ jobs: run: cabal v2-update - name: Install alex run: cabal v2-install alex - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Regenerate files run: | make lexer @@ -78,6 +78,6 @@ jobs: cabal-env --transitive QuickCheck cabal-env array bytestring containers deepseq directory filepath pretty process time binary unix text parsec mtl cat $HOME/.ghc/*/environments/default - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Doctest run: make doctest diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index b32b112809c..31c8467eb44 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -47,7 +47,7 @@ jobs: key: linux-store-meta - name: Update Hackage index run: cabal v2-update - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: make cabal-install-dev run: runghc cabal-dev-scripts/src/Preprocessor.hs -o cabal-install/cabal-install.cabal -f CABAL_FLAG_LIB cabal-install/cabal-install.cabal.pp # We cannot ask for all dependencies, but we can for Cabal. diff --git a/boot/ci-artifacts.template.yml b/boot/ci-artifacts.template.yml index 4ff11b2598a..5064cf67775 100644 --- a/boot/ci-artifacts.template.yml +++ b/boot/ci-artifacts.template.yml @@ -24,7 +24,7 @@ jobs: echo "::add-path::$HOME/.cabal/bin" - name: Update Hackage index run: cabal v2-update - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Release project run: | cp cabal.project.release cabal.project @@ -70,7 +70,7 @@ jobs: echo "::add-path::$HOME/.cabal/bin" - name: Update Hackage index run: cabal v2-update - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Release project run: | cp cabal.project.release cabal.project @@ -114,7 +114,7 @@ jobs: cabal user-config init -a "http-transport: plain-http" -a "store-dir: C:\SR" -f -v3 - name: Update Hackage index run: cabal v2-update - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Release project shell: bash run: | diff --git a/boot/ci-bootstrap.template.yml b/boot/ci-bootstrap.template.yml index a1fd2559917..ce62fb4dbef 100644 --- a/boot/ci-bootstrap.template.yml +++ b/boot/ci-bootstrap.template.yml @@ -25,7 +25,7 @@ jobs: - name: Set PATH run: | echo "::add-path::/opt/ghc/8.6.5/bin" - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: bootstrap.sh env: EXTRA_CONFIGURE_OPTS: "" @@ -52,7 +52,7 @@ jobs: run: | echo "::add-path::/opt/ghc/8.6.5/bin" echo "::add-path::$HOME/.cabal/bin" - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: bootstrap.sh env: EXTRA_CONFIGURE_OPTS: "" diff --git a/boot/ci-linux.template.yml b/boot/ci-linux.template.yml index 720a176347b..c98b0443985 100644 --- a/boot/ci-linux.template.yml +++ b/boot/ci-linux.template.yml @@ -54,7 +54,7 @@ jobs: {% endif %} - name: Update Hackage index run: cabal v2-update - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 {% for step in job.steps %} - name: Validate {{step}} run: sh validate.sh -j 2 -w ghc-{{job.version}} -v {{job.flags}} -s {{step}} diff --git a/boot/ci-macos.template.yml b/boot/ci-macos.template.yml index 6d2daff1b93..41028d7e027 100644 --- a/boot/ci-macos.template.yml +++ b/boot/ci-macos.template.yml @@ -57,7 +57,7 @@ jobs: cd $(mktemp -d) {# aeson +fast, so we don't wait for -O2 #} cabal v2-install cabal-plan --constraint='cabal-plan ^>=0.6.2.0' --constraint='aeson +fast' - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 {% for step in job.steps %} - name: Validate {{step}} run: sh validate.sh -j 2 -w ghc-{{job.version}} -v {{job.flags}} -s {{step}} diff --git a/boot/ci-quick-jobs.template.yml b/boot/ci-quick-jobs.template.yml index afaa63e646b..d53658c575e 100644 --- a/boot/ci-quick-jobs.template.yml +++ b/boot/ci-quick-jobs.template.yml @@ -36,7 +36,7 @@ jobs: run: cabal v2-update - name: Install alex run: cabal v2-install alex - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Regenerate files run: | make lexer @@ -78,6 +78,6 @@ jobs: cabal-env --transitive QuickCheck cabal-env array bytestring containers deepseq directory filepath pretty process time binary unix text parsec mtl cat $HOME/.ghc/*/environments/default - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Doctest run: make doctest diff --git a/boot/ci-windows.template.yml b/boot/ci-windows.template.yml index 48a5431cdc6..74e4fb6e8d8 100644 --- a/boot/ci-windows.template.yml +++ b/boot/ci-windows.template.yml @@ -54,7 +54,7 @@ jobs: key: linux-store-meta - name: Update Hackage index run: cabal v2-update - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: make cabal-install-dev run: runghc cabal-dev-scripts/src/Preprocessor.hs -o cabal-install/cabal-install.cabal -f CABAL_FLAG_LIB cabal-install/cabal-install.cabal.pp # We cannot ask for all dependencies, but we can for Cabal. diff --git a/cabal-dev-scripts/src/GenValidate.hs b/cabal-dev-scripts/src/GenValidate.hs index 80e8ff19ce1..17ef257bb03 100644 --- a/cabal-dev-scripts/src/GenValidate.hs +++ b/cabal-dev-scripts/src/GenValidate.hs @@ -3,15 +3,14 @@ -- runghc -package-env=default Validate.hs validate.yml.zinza .github/workflows/validate.yml module Main (main) where +import Data.List (isPrefixOf) import GHC.Generics (Generic) import System.Environment (getArgs) import System.Exit (exitFailure) -import Zinza - (Zinza (..), genericFromValueSFP, genericToTypeSFP, genericToValueSFP, - parseAndCompileTemplateIO) +import Zinza (Zinza (..), genericFromValueSFP, genericToTypeSFP, genericToValueSFP, parseAndCompileTemplateIO) import qualified Data.ByteString.Lazy.Char8 as LBS8 -import qualified Data.YAML as YAML +import qualified Data.YAML as YAML main :: IO () main = do @@ -22,16 +21,15 @@ main = do -- this shouldn't fail (run-time errors are due bugs in zinza) w <- run Z { zJobs = - [ GhcJob "8.8.2" False "--solver-benchmarks" False [] defSteps - , GhcJob "8.8.1" False "--solver-benchmarks" False [] defSteps -- to be removed - , GhcJob "8.6.5" False "" False ["8.8.1"] defSteps - , GhcJob "8.4.4" False "" False ["8.8.1"] defSteps - , GhcJob "8.2.2" False "" False ["8.8.1"] defSteps - , GhcJob "8.0.2" False "" False ["8.8.1"] defSteps - , GhcJob "7.10.3" False "" False ["8.8.1"] defSteps - , GhcJob "7.8.4" False "--lib-only" False ["8.8.1"] libSteps - , GhcJob "7.6.3" True "--lib-only" False ["8.8.1"] libSteps - , GhcJob "8.8.1" True "--lib-only" True ["8.8.1"] $ + [ GhcJob "8.8.3" False "--solver-benchmarks" False [] defSteps + , GhcJob "8.6.5" False "" False ["8.8.3"] defSteps + , GhcJob "8.4.4" False "" False ["8.8.3"] defSteps + , GhcJob "8.2.2" False "" False ["8.8.3"] defSteps + , GhcJob "8.0.2" False "" False ["8.8.3"] defSteps + , GhcJob "7.10.3" False "" False ["8.8.3"] defSteps + , GhcJob "7.8.4" False "--lib-only" False ["8.8.3"] libSteps + , GhcJob "7.6.3" True "--lib-only" False ["8.8.3"] libSteps + , GhcJob "8.8.3" True "--lib-only" True ["8.8.3"] $ libSteps ++ [ "lib-suite-extras --extra-hc /opt/ghc/7.0.4/bin/ghc-7.0.4" , "lib-suite-extras --extra-hc /opt/ghc/7.2.2/bin/ghc-7.2.2" @@ -39,7 +37,9 @@ main = do ] ] , zMacosJobs = - [ mkMacGhcJob "8.8.1" "https://downloads.haskell.org/~ghc/8.8.1/ghc-8.8.1-x86_64-apple-darwin.tar.xz" + [ mkMacGhcJob "8.8.3" "https://downloads.haskell.org/~ghc/8.8.3/ghc-8.8.3-x86_64-apple-darwin.tar.xz" + -- we have 8.8.2 job as something weird is going with 8.8.3 one. + , mkMacGhcJob "8.8.2" "https://downloads.haskell.org/~ghc/8.8.2/ghc-8.8.2-x86_64-apple-darwin.tar.xz" , mkMacGhcJob "8.6.5" "https://downloads.haskell.org/~ghc/8.6.5/ghc-8.6.5-x86_64-apple-darwin.tar.xz" ] , zWinJobs = @@ -133,7 +133,7 @@ mkMacGhcJob v u = MacGhcJob { mgjVersion = v , mgjGhcUrl = u , mgjFlags = "" - , mgjNeeds = ["8.8.1" | v /= "8.8.1"] + , mgjNeeds = ["8.8.2" | not $ "8.8" `isPrefixOf` v ] , mgjSteps = defSteps }