Skip to content

Commit

Permalink
switch validate to 22.04 for now
Browse files Browse the repository at this point in the history
`validate-old-ghcs` doesn't work on 24.04, which GHA just updated
to; and it uses build artifacts from the earlier steps, so for now
the whole thing needs to be downgraded to get thinsg working. We
must address this properly later.

(cherry picked from commit 85f0f0c)

# Conflicts:
#	.github/workflows/validate.yml
  • Loading branch information
geekosaur authored and mergify[bot] committed Oct 11, 2024
1 parent 2a48e40 commit b475d7e
Showing 1 changed file with 13 additions and 1 deletion.
14 changes: 13 additions & 1 deletion .github/workflows/validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,13 @@ jobs:
matrix:
sys:
- { os: windows-latest, shell: "C:/msys64/usr/bin/bash.exe -e {0}" }
<<<<<<< HEAD
- { os: ubuntu-latest, shell: bash }
- { os: macos-13, shell: bash }
=======
- { os: ubuntu-22.04, shell: bash }
- { os: macos-latest, shell: bash }
>>>>>>> 85f0f0c6c (switch validate to 22.04 for now)
# If you remove something from here, then add it to the old-ghcs job.
# Also a removed GHC from here means that we are actually dropping
# support, so the PR *must* have a changelog entry.
Expand Down Expand Up @@ -233,7 +238,7 @@ jobs:

validate-old-ghcs:
name: Validate old ghcs ${{ matrix.extra-ghc }}
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
needs: validate

strategy:
Expand Down Expand Up @@ -362,7 +367,14 @@ jobs:
needs: validate
strategy:
matrix:
<<<<<<< HEAD
os: [ubuntu-latest, macos-13, windows-latest]
=======
sys:
- { os: windows-latest, shell: "C:/msys64/usr/bin/bash.exe -e {0}" }
- { os: ubuntu-22.04, shell: bash }
- { os: macos-latest, shell: bash }
>>>>>>> 85f0f0c6c (switch validate to 22.04 for now)
# We only use one ghc version the used one for the next release (defined at top of the workflow)
# We need to build an array dynamically to inject the appropiate env var in a previous job,
# see https://docs.github.com/en/actions/learn-github-actions/expressions#fromjson
Expand Down

0 comments on commit b475d7e

Please sign in to comment.