Skip to content

Commit

Permalink
CI: Use latest GHC 9.2, 9.4 minor releases
Browse files Browse the repository at this point in the history
  • Loading branch information
RyanGlScott committed Nov 20, 2023
1 parent 9f8e173 commit bf877e8
Show file tree
Hide file tree
Showing 5 changed files with 132 additions and 132 deletions.
26 changes: 13 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Overall configuration notes:
# - Artifact uploads for binaries are from GHC 9.2.7
# - Artifact uploads for binaries are from GHC 9.2.8
# - Builds for Ubuntu happen on 22.04. We also include a single configuration
# for 20.04 to increase our Linux coverage.
# - Docker builds happen nightly, on manual invocation, and on release branch commits
Expand Down Expand Up @@ -78,21 +78,21 @@ jobs:
matrix:
os: [ubuntu-22.04, macos-12, windows-2019]
cabal: ["3.10.1.0"]
ghc: ["9.2.7", "9.4.4", "9.6.3"]
ghc: ["9.2.8", "9.4.8", "9.6.3"]
run-tests: [true]
hpc: [false]
include:
# We include one job from an older Ubuntu LTS release to increase our
# coverage of possible Linux configurations. Since we already run the
# tests with the newest LTS release, we won't bother testing this one.
- os: ubuntu-20.04
ghc: "9.2.7"
ghc: "9.2.8"
cabal: "3.10.1.0"
run-tests: false
hpc: false
# Include one job with HPC enabled
- os: ubuntu-22.04
ghc: "9.4.4"
ghc: "9.4.8"
cabal: "3.10.1.0"
run-tests: true
hpc: true
Expand Down Expand Up @@ -171,7 +171,7 @@ jobs:
dest: dist-tests

- uses: actions/upload-artifact@v2
if: "matrix.ghc == '9.2.7'"
if: "matrix.ghc == '9.2.8'"
with:
path: dist-tests
name: dist-tests-${{ matrix.os }}
Expand All @@ -188,14 +188,14 @@ jobs:
- shell: bash
run: .github/ci.sh zip_dist_with_solvers $NAME-with-solvers

- if: matrix.ghc == '9.2.7' && github.event.pull_request.head.repo.fork == false
- if: matrix.ghc == '9.2.8' && github.event.pull_request.head.repo.fork == false
shell: bash
env:
SIGNING_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }}
SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
run: .github/ci.sh sign $NAME.tar.gz

- if: matrix.ghc == '9.2.7' && github.event.pull_request.head.repo.fork == false
- if: matrix.ghc == '9.2.8' && github.event.pull_request.head.repo.fork == false
shell: bash
env:
SIGNING_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }}
Expand All @@ -205,7 +205,7 @@ jobs:
##########################################################################
# We upload an archive containing SAW, and also and archive containing SAW
# and the set of possible SMT solvers, but only for our "primary"
# distribution (currently: GHC 9.2.7). These archives are utilized in
# distribution (currently: GHC 9.2.8). These archives are utilized in
# subsequent CI jobs, but are also published for external users, and are
# therefore signed.
#
Expand All @@ -220,23 +220,23 @@ jobs:
# In the next 3 steps we check that `matrix.hpc == false` so that if the
# distribution version matches the HPC version, the HPC build artifacts do
# not clobber the non-HPC distribution artifacts.
- if: matrix.ghc == '9.2.7' && matrix.hpc == false
- if: matrix.ghc == '9.2.8' && matrix.hpc == false
uses: actions/upload-artifact@v2
with:
name: ${{ steps.config.outputs.name }} (GHC ${{ matrix.ghc }})
path: "${{ steps.config.outputs.name }}.tar.gz*"
if-no-files-found: error
retention-days: ${{ needs.config.outputs.retention-days }}

- if: matrix.ghc == '9.2.7' && matrix.hpc == false
- if: matrix.ghc == '9.2.8' && matrix.hpc == false
uses: actions/upload-artifact@v2
with:
name: ${{ steps.config.outputs.name }}-with-solvers (GHC ${{ matrix.ghc }})
path: "${{ steps.config.outputs.name }}-with-solvers.tar.gz*"
if-no-files-found: error
retention-days: ${{ needs.config.outputs.retention-days }}

- if: matrix.ghc == '9.2.7' && matrix.run-tests && matrix.hpc == false
- if: matrix.ghc == '9.2.8' && matrix.run-tests && matrix.hpc == false
uses: actions/upload-artifact@v2
with:
path: dist/bin
Expand Down Expand Up @@ -714,7 +714,7 @@ jobs:
- hmac-failure
- awslc
- blst
ghc: ["9.2.7"]
ghc: ["9.2.8"]
steps:
- uses: actions/checkout@v2
- run: |
Expand Down Expand Up @@ -767,7 +767,7 @@ jobs:
runs-on: ubuntu-22.04
strategy:
matrix:
ghc: ["9.2.7"]
ghc: ["9.2.8"]
steps:
- uses: actions/checkout@v2
- run: |
Expand Down
Loading

0 comments on commit bf877e8

Please sign in to comment.