diff --git a/.github/config.yml b/.github/config.yml index 9089030b859..84d29368e6b 100644 --- a/.github/config.yml +++ b/.github/config.yml @@ -12,4 +12,4 @@ GHC_FOR_VALIDATE: '["9.10.1", "9.8.2", "9.6.6", "9.4.8", "9.2.8", "9.0.2", "8.10 GHC_FOR_VALIDATE_OLD: '["8.4.4", "8.2.2", "8.0.2"]' # COMMON_FLAGS: -j 2 -v -LTS_BRANCH: '3.12' +LTS_RELEASE: '3.12' diff --git a/.github/workflows/check-sdist.yml b/.github/workflows/check-sdist.yml index 70d76cdfe77..f9349238310 100644 --- a/.github/workflows/check-sdist.yml +++ b/.github/workflows/check-sdist.yml @@ -47,7 +47,7 @@ jobs: # release of a corresponding Cabal and friends. it can also be short since it's # highly unlikely that we are releasing really old branches. ghc: - ["9.10.1", "9.8.1", "9.6.1"] + ["9.12.1", "9.10.1", "9.8.1", "9.6.1"] steps: diff --git a/.github/workflows/prerelease-lts.yml b/.github/workflows/prerelease-lts.yml index 63d4a6bad58..131d8857c4d 100644 --- a/.github/workflows/prerelease-lts.yml +++ b/.github/workflows/prerelease-lts.yml @@ -77,7 +77,7 @@ jobs: - uses: actions/checkout@v4 with: - ref: ${{ needs.config.outputs.LTS_BRANCH }} + ref: ${{ needs.config.outputs.LTS_RELEASE }} # We were making prereleases with validate builds, so I will continue to do so - uses: ./.github/actions/validate-build @@ -116,7 +116,7 @@ jobs: permissions: contents: write - needs: [prerelease-build-most, prerelease-build-alpine] + needs: [config, prerelease-build-most, prerelease-build-alpine] steps: - uses: liudonghua123/delete-release-action@v1 @@ -134,6 +134,6 @@ jobs: uses: softprops/action-gh-release@v2 with: tag_name: cabal-lts-head - target_committish: ${{ needs.config.outputs.LTS_BRANCH }} + target_commitish: ${{ needs.config.outputs.LTS_RELEASE }} prerelease: true files: binaries/cabal-* diff --git a/.github/workflows/tier-2.yml b/.github/workflows/tier-2.yml index bd0ecd3ad4e..a8b62f8219e 100644 --- a/.github/workflows/tier-2.yml +++ b/.github/workflows/tier-2.yml @@ -105,7 +105,7 @@ jobs: steps: - run: ${{ needs.config.outputs.env }} - - run: ${{ matrix.os.prerequisites }} + - run: ${{ matrix.sys.prerequisites }} - uses: actions/checkout@v4 @@ -175,7 +175,7 @@ jobs: steps: - run: ${{ needs.config.outputs.env }} - - run: ${{ matrix.os.prerequisites }} + - run: ${{ matrix.sys.prerequisites }} - uses: ./.github/actions/cabal-setup with: @@ -239,7 +239,7 @@ jobs: steps: - run: ${{ needs.config.outputs.env }} - - run: ${{ matrix.os.prerequisites }} + - run: ${{ matrix.sys.prerequisites }} - uses: ./.github/actions/cabal-setup with: @@ -300,7 +300,7 @@ jobs: steps: - run: ${{ needs.config.outputs.env }} - - run: ${{ matrix.os.prerequisites }} + - run: ${{ matrix.sys.prerequisites }} - uses: ./.github/actions/cabal-setup with: diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 15ddbcaaca7..ef64c9de28e 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -149,7 +149,7 @@ jobs: with: shell: ${{ matrix.sys.shell }} ghc: ${{ matrix.ghc }} - allow-newer: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.allow_newer || '' }} + allow-newer: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.allow-newer || '' }} constraints: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.constraints || '' }} # We never validate this. We would probably have caught https://gitlab.haskell.org/ghc/ghc/-/issues/25087 @@ -179,7 +179,7 @@ jobs: with: ghc: ${{ env.GHC_FOR_RELEASE }} static: 'true' - allow-newer: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.allow_newer || '' }} + allow-newer: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.allow-newer || '' }} constraints: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.constraints || '' }} # Thanks yet again to YAML-as-code, I need three of these now. This is abysmally stupid. @@ -231,7 +231,7 @@ jobs: with: shell: ${{ matrix.sys.shell }} ghc: ${{ matrix.ghc }} - allow-newer: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.allow_newer || '' }} + allow-newer: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.allow-newer || '' }} constraints: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.constraints || '' }} # Note: we rely on cabal and the test suites being already cached here. If they aren't, this @@ -289,7 +289,7 @@ jobs: with: shell: ${{ matrix.sys.shell }} ghc: ${{ matrix.ghc }} - allow-newer: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.allow_newer || '' }} + allow-newer: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.allow-newer || '' }} constraints: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.constraints || '' }} - run: | @@ -319,7 +319,7 @@ jobs: with: shell: ${{ matrix.sys.shell }} ghc: ${{ needs.config.outputs.GHC_FOR_SOLVER_BENCHMARKS }} - allow-newer: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.allow_newer || '' }} + allow-newer: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.allow-newer || '' }} constraints: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.constraints || '' }} - run: | @@ -385,7 +385,7 @@ jobs: with: ghc: ${{ needs.config.outputs.GHC_FOR_RELEASE }} shell: ${{ matrix.sys.shell }} - allow-newer: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.allow_newer || '' }} + allow-newer: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.allow-newer || '' }} constraints: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.constraints || '' }} # We use this job as a summary of the workflow