Skip to content

Commit

Permalink
[chore] sets up the merge queue a little better + lets the bot accoun…
Browse files Browse the repository at this point in the history
…t handle changelogs (#2898)

merge queue awesome ++ goodness

no player facing changes
  • Loading branch information
hry-gh authored Mar 21, 2023
1 parent b7bf011 commit 5713e8a
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/auto_changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ jobs:
script: |
const { processAutoChangelog } = await import('${{ github.workspace }}/tools/pull_request_hooks/autoChangelog.js')
await processAutoChangelog({ github, context })
github-token: ${{ secrets.GITHUB_TOKEN }}
github-token: ${{ secrets.BOT_TOKEN_CM || secrets.GITHUB_TOKEN }}
12 changes: 8 additions & 4 deletions .github/workflows/ci_suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,20 @@ on:
push:
branches:
- master
- 'gh-readonly-queue/master/**'
pull_request:
branches:
- master
merge_group:
branches:
- master
jobs:
run_linters:
if: "!contains(github.event.head_commit.message, '[ci skip]')"
name: Run Linters
runs-on: ubuntu-22.04
concurrency:
group: run_linters-${{ github.ref }}
group: run_linters-${{ github.head_ref || github.run_id }}
cancel-in-progress: true
steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -58,7 +62,7 @@ jobs:
~/dreamchecker > ${GITHUB_WORKSPACE}/output-annotations.txt 2>&1
- name: Annotate Lints
uses: yogstation13/DreamAnnotate@v2
if: always()
if: success() || failure()
with:
outputFile: output-annotations.txt

Expand Down Expand Up @@ -86,7 +90,7 @@ jobs:
outputs:
maps: ${{ steps.map_finder.outputs.maps }}
concurrency:
group: find_all_maps-${{ github.ref }}
group: find_all_maps-${{ github.head_ref || github.run_id }}
cancel-in-progress: true
steps:
- uses: actions/checkout@v3
Expand All @@ -106,7 +110,7 @@ jobs:
matrix:
map: ${{ fromJSON(needs.find_all_maps.outputs.maps).paths }}
concurrency:
group: run_all_tests-${{ github.ref }}-${{ matrix.map }}
group: run_all_tests-${{ github.head_ref || github.run_id }}-${{ matrix.map }}
cancel-in-progress: true
uses: ./.github/workflows/run_unit_tests.yml
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/compile_changelogs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@ jobs:
if: steps.value_holder.outputs.ACTIONS_ENABLED
uses: ad-m/github-push-action@master
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
github_token: ${{ secrets.BOT_TOKEN_CM || secrets.GITHUB_TOKEN }}

0 comments on commit 5713e8a

Please sign in to comment.