Merge branch 'master' into dev

This commit is contained in:
tgstation-server-ci[bot]
2024-08-26 00:11:44 +00:00
5 changed files with 16 additions and 13 deletions
@@ -19,11 +19,18 @@ jobs:
if: github.event.pull_request.user.id == 8171642 && !github.event.pull_request.draft && !contains(github.event.pull_request.body, '- [ ]') && (github.event.pull_request.base.repo.owner.login == 'tgstation' || github.event.pull_request.base.repo.owner.login == 'Cyberboss')
runs-on: ubuntu-latest
steps:
- name: Generate App Token
id: app-token-generation
uses: getsentry/action-github-app-token@d4b5da6c5e37703f8c3b3e43abb5705b46e159cc
with:
app_id: ${{ secrets.APP_ID }}
private_key: ${{ secrets.APP_PRIVATE_KEY }}
- name: GitHub API Call
run: |
curl --request POST \
--url https://api.github.com/repos/${{github.repository}}/pulls/${{github.event.number}}/reviews \
--header 'authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' \
--header 'authorization: Bearer ${{ steps.app-token-generation.outputs.token }}' \
--header 'content-type: application/json' \
-d '{"event":"APPROVE"}' \
--fail
@@ -11,10 +11,6 @@ concurrency:
group: "dependabot-automerge-${{ github.head_ref || github.run_id }}-${{ github.event_name }}"
cancel-in-progress: true
env:
TGS_DOTNET_VERSION: 8
TGS_DOTNET_QUALITY: ga
jobs:
automerge:
name: Enable Automerge on Dependabot PRs
+8
View File
@@ -13,9 +13,17 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Generate App Token
id: app-token-generation
uses: getsentry/action-github-app-token@d4b5da6c5e37703f8c3b3e43abb5705b46e159cc
with:
app_id: ${{ secrets.APP_ID }}
private_key: ${{ secrets.APP_PRIVATE_KEY }}
- name: Rerun flaky tests
uses: actions/github-script@v7
with:
github-token: ${{ steps.app-token-generation.outputs.token }}
script: |
const { rerunFlakyTests } = await import('${{ github.workspace }}/.github/workflows/scripts/rerunFlakyTests.js')
await rerunFlakyTests({ github, context })
-4
View File
@@ -6,10 +6,6 @@ on:
- master
workflow_dispatch:
env:
TGS_DOTNET_VERSION: 8
TGS_DOTNET_QUALITY: ga
jobs:
master-merge:
name: Master Merge
@@ -8,10 +8,6 @@ on:
- "*"
workflow_dispatch:
env:
TGS_DOTNET_VERSION: 8
TGS_DOTNET_QUALITY: ga
concurrency:
group: "ss13-mirror-sync"
cancel-in-progress: true