diff --git a/.github/workflows/ci-lint.yml b/.github/workflows/ci-lint.yml index 8ab449c..706e587 100644 --- a/.github/workflows/ci-lint.yml +++ b/.github/workflows/ci-lint.yml @@ -22,5 +22,5 @@ jobs: - run: | # These vars are format strings. # shellcheck disable=SC2016 - go run github.com/rhysd/actionlint/cmd/actionlint@v1.6.15 \ + go run github.com/rhysd/actionlint/cmd/actionlint@v1.6.25 \ -format '{{range $err := .}}::error file={{$err.Filepath}},line={{$err.Line}},col={{$err.Column}}::{{$err.Message}}%0A```%0A{{replace $err.Snippet "\\n" "%0A"}}%0A```\n{{end}}' -ignore 'SC2016:' diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 407b2c7..a81fe93 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,6 +1,7 @@ name: Merge on: + merge_group: push: branches: - staging @@ -30,11 +31,11 @@ jobs: ./.github/scripts/set-output version "${VERSION}" - name: Install git-cliff - uses: baptiste0928/cargo-install@bf6758885262d0e6f61089a9d8c8790d3ac3368f # v1.3.0 + uses: baptiste0928/cargo-install@v2 with: crate: git-cliff - args: --git https://github.com/AaronFriel/git-cliff --rev 702c79236ef0b0a3d2430f73902db3339933fbfd - version: 0.8.1 + git: https://github.com/AaronFriel/git-cliff + commit: 702c79236ef0b0a3d2430f73902db3339933fbfd - name: Extract release notes id: notes shell: bash @@ -120,7 +121,7 @@ jobs: name: Publish needs: [test-ok, version-check, info] uses: ./.github/workflows/ci-publish.yml - if: ${{ github.ref_name == 'staging' }} + if: github.ref_name == 'staging' || github.event_name == 'merge_group' with: version: ${{ needs.info.outputs.version }} release_notes: ${{ needs.info.outputs.release_notes }} diff --git a/.github/workflows/pr-check-commit-changelog.yml b/.github/workflows/pr-check-commit-changelog.yml index d0676a4..ae813c1 100644 --- a/.github/workflows/pr-check-commit-changelog.yml +++ b/.github/workflows/pr-check-commit-changelog.yml @@ -25,11 +25,11 @@ jobs: with: fetch-depth: 0 - name: Install git-cliff - uses: baptiste0928/cargo-install@bf6758885262d0e6f61089a9d8c8790d3ac3368f # v1.3.0 + uses: baptiste0928/cargo-install@v2 with: crate: git-cliff - args: --git https://github.com/AaronFriel/git-cliff --rev 702c79236ef0b0a3d2430f73902db3339933fbfd - version: 0.8.1 + git: https://github.com/AaronFriel/git-cliff + commit: 702c79236ef0b0a3d2430f73902db3339933fbfd - name: Changelog id: changelog env: