Skip to content

merge queue: embarking master (c7ed72d) and #11154 together #11170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mergify wants to merge 3 commits into from
Closed

merge queue: embarking master (c7ed72d) and #11154 together #11170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b4696fd
Bump actions/checkout from 4 to 5
dependabot[bot] Aug 12, 2025
29241a2
node.js is broken on Alpine 3.12
geekosaur Aug 12, 2025
58e5ea3
Merge of #11154
mergify[bot] Aug 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/bootstrap.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
key: bootstrap-${{ runner.os }}-${{ matrix.ghc }}-20221115-${{ github.sha }}
restore-keys: bootstrap-${{ runner.os }}-${{ matrix.ghc }}-20221115-

- uses: actions/checkout@v4
- uses: actions/checkout@v5
- uses: haskell-actions/setup@v2
with:
ghc-version: ${{ matrix.ghc }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/changelogs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
echo "$HOME/.local/bin" >> $GITHUB_PATH

- name: Checkout cabal sources
uses: actions/checkout@v4
uses: actions/checkout@v5

- name: Run changelog-d
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-sdist.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
ghc-version: ${{ matrix.ghc }}
cabal-version: latest

- uses: actions/checkout@v4
- uses: actions/checkout@v5

- name: Make sdist
run: cabal sdist cabal-install
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
validate:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5

- uses: marocchino/validate-dependabot@v3
id: validate
2 changes: 1 addition & 1 deletion .github/workflows/format.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
fourmolu:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- uses: haskell-actions/run-fourmolu@v11
with:
version: "0.12.0.0"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
hlint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- uses: haskell-actions/hlint-setup@v2
with:
version: "3.10"
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/quick-jobs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
cabal --version
- name: Update Hackage index
run: cabal v2-update
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- name: Generate build plan for correct cache key
run: ${{ env.cabal_build }} --dry-run
- name: Restore cached dependencies
Expand Down Expand Up @@ -99,7 +99,7 @@ jobs:
restore-keys: linux-store-doctest
- name: Update Hackage index
run: cabal v2-update
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- name: Install doctest
run: make doctest-install
- name: Doctest
Expand Down Expand Up @@ -129,7 +129,7 @@ jobs:
cabal --version
- name: Update Hackage index
run: cabal v2-update
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- name: Generate build plan for correct cache key
run: ${{ env.cabal_build }} --dry-run
- name: Restore cached dependencies
Expand Down Expand Up @@ -166,7 +166,7 @@ jobs:
cabal --version
- name: Update Hackage Index
run: cabal v2-update
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- name: Check Release with Pinned Hackage
run: cabal build all --dry-run --project-file=cabal.release.project
- name: Check Release with Latest Hackage
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
if: ${{ startsWith(github.ref, 'refs/tags/') || github.event_name == 'workflow_dispatch' }}
steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v5

- name: Download artifacts
uses: actions/download-artifact@v5
Expand Down
41 changes: 14 additions & 27 deletions .github/workflows/reusable-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,13 +140,6 @@ jobs:
, ARTIFACT: "x86_64-linux-unknown"
, ADD_CABAL_ARGS: "--enable-split-sections --enable-executable-static"
},
{ image: "alpine:3.12"
, installCmd: "apk update && apk add"
, toolRequirements: "${{ needs.tool-output.outputs.apk_tools }}"
, DISTRO: "Unknown"
, ARTIFACT: "x86_64-linux-alpine312"
, ADD_CABAL_ARGS: "--enable-split-sections"
},
{ image: "alpine:3.20"
, installCmd: "apk update && apk add"
, toolRequirements: "${{ needs.tool-output.outputs.apk_tools }}"
Expand All @@ -168,7 +161,7 @@ jobs:
with:
cabal: ${{ env.CABAL_VERSION }}

- uses: actions/checkout@v4
- uses: actions/checkout@v5
with:
ref: ${{ matrix.branch }}

Expand Down Expand Up @@ -207,7 +200,7 @@ jobs:
ADD_CABAL_ARGS: "--enable-split-sections --enable-executable-static"

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
with:
ref: ${{ matrix.branch }}

Expand Down Expand Up @@ -248,7 +241,7 @@ jobs:
}
]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
with:
ref: ${{ matrix.branch }}

Expand Down Expand Up @@ -297,7 +290,7 @@ jobs:
matrix:
branch: ${{ fromJSON(inputs.branches) }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
with:
ref: ${{ matrix.branch }}

Expand Down Expand Up @@ -337,7 +330,7 @@ jobs:
matrix:
branch: ${{ fromJSON(inputs.branches) }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
with:
ref: ${{ matrix.branch }}

Expand Down Expand Up @@ -376,7 +369,7 @@ jobs:
matrix:
branch: ${{ fromJSON(inputs.branches) }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
with:
ref: ${{ matrix.branch }}

Expand Down Expand Up @@ -430,7 +423,7 @@ jobs:
matrix:
branch: ${{ fromJSON(inputs.branches) }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
with:
ref: ${{ matrix.branch }}

Expand Down Expand Up @@ -530,12 +523,6 @@ jobs:
, DISTRO: "Unknown"
, ARTIFACT: "x86_64-linux-unknown"
},
{ image: "alpine:3.12"
, installCmd: "apk update && apk add"
, toolRequirements: "${{ needs.tool-output.outputs.apk_tools }}"
, DISTRO: "Unknown"
, ARTIFACT: "x86_64-linux-alpine312"
},
{ image: "alpine:3.20"
, installCmd: "apk update && apk add"
, toolRequirements: "${{ needs.tool-output.outputs.apk_tools }}"
Expand All @@ -551,7 +538,7 @@ jobs:
run: |
${{ matrix.platform.installCmd }} curl bash git ${{ matrix.platform.toolRequirements }}

- uses: actions/checkout@v4
- uses: actions/checkout@v5
with:
ref: ${{ matrix.branch }}

Expand Down Expand Up @@ -596,7 +583,7 @@ jobs:
# matrix:
# branch: ${{ fromJSON(inputs.branches) }}
# steps:
# - uses: actions/checkout@v4
# - uses: actions/checkout@v5
# with:
# ref: ${{ matrix.branch }}
#
Expand Down Expand Up @@ -633,7 +620,7 @@ jobs:
}
]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
with:
ref: ${{ matrix.branch }}

Expand Down Expand Up @@ -677,7 +664,7 @@ jobs:
matrix:
branch: ${{ fromJSON(inputs.branches) }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
with:
ref: ${{ matrix.branch }}

Expand Down Expand Up @@ -718,7 +705,7 @@ jobs:
matrix:
branch: ${{ fromJSON(inputs.branches) }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
with:
ref: ${{ matrix.branch }}

Expand Down Expand Up @@ -754,7 +741,7 @@ jobs:
matrix:
branch: ${{ fromJSON(inputs.branches) }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
with:
ref: ${{ matrix.branch }}

Expand Down Expand Up @@ -803,7 +790,7 @@ jobs:
matrix:
branch: ${{ fromJSON(inputs.branches) }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
with:
ref: ${{ matrix.branch }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/typos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:

steps:

- uses: actions/checkout@v4
- uses: actions/checkout@v5

- run: |
wget -q https://github.com/crate-ci/typos/releases/download/${{ env.TYPOS_VER }}/typos-${{ env.TYPOS_VER }}-${{ env.TYPOS_PLATFORM }}.tar.gz
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/users-guide.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
python-version: ['3.10']

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
with:
submodules: recursive

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/validate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ jobs:
run: |
echo "TMP=${{ runner.temp }}" >> "$GITHUB_ENV"

- uses: actions/checkout@v4
- uses: actions/checkout@v5

# See https://github.com/haskell/cabal/blob/master/CONTRIBUTING.md#hackage-revisions
- name: Add manually supplied allow-newer
Expand Down Expand Up @@ -263,7 +263,7 @@ jobs:
fail-fast: false

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5

- name: Install prerequisites for old GHCs
run: |
Expand Down Expand Up @@ -314,7 +314,7 @@ jobs:
build-alpine:
name: Build statically linked using alpine
runs-on: ubuntu-latest
container: "alpine:3.19"
container: "alpine:3.20"
steps:
- name: Install extra dependencies
shell: sh
Expand All @@ -328,7 +328,7 @@ jobs:
# that Alpine's git doesn't like. Hack around it.
- run: git config --global --add safe.directory $(pwd)

- uses: actions/checkout@v4
- uses: actions/checkout@v5

# See https://github.com/haskell/cabal/blob/master/CONTRIBUTING.md#hackage-revisions
- name: Manually supplied constraints/allow-newer
Expand Down Expand Up @@ -422,7 +422,7 @@ jobs:
run: |
echo "TMP=${{ runner.temp }}" >> "$GITHUB_ENV"

- uses: actions/checkout@v4
- uses: actions/checkout@v5

- uses: haskell-actions/setup@v2
id: setup-haskell
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/whitespace.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

steps:

- uses: actions/checkout@v4
- uses: actions/checkout@v5

- run: |
# no longer using the action because apparently we're supposed to use the Makefile here
Expand Down
Loading