Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
tgstation-server-ci[bot] committed Aug 26, 2024
2 parents 9a91e6f + 9c300d4 commit 88a820e
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 7 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/ci-security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@ on:
- dev
- master
pull_request_target:
types: [opened, reopened, labeled, synchronize]
types:
- opened
- reopened
- labeled
- synchronize
branches:
- dev
- master
Expand All @@ -20,8 +24,6 @@ jobs:
name: Check CI Clearance
if: github.event_name == 'pull_request_target' && (github.event.pull_request.head.repo.id != github.event.pull_request.base.repo.id || github.event.pull_request.user.id == 49699333) && github.event.pull_request.state == 'open'
runs-on: ubuntu-latest
permissions:
pull-requests: write
steps:
- name: Generate App Token
id: app-token-generation
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rerun-flaky-tests.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Rerun Flaky Live Tests
name: Rerun Flaky Tests
on:
workflow_run:
workflows: ["CI Pipeline", "CI Security"]
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/size-label.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
name: Size Labelling
on:
pull_request_target:
types:
- reopened
- labeled
- synchronize

concurrency:
group: "size-labelling-${{ github.head_ref || github.run_id }}-${{ github.event_name }}"
Expand All @@ -9,9 +13,6 @@ concurrency:
jobs:
size-label:
name: Add Size Label
permissions:
contents: read
pull-requests: write
runs-on: ubuntu-latest
steps:
- name: Generate App Token
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/update-ss13-org-mirror.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ jobs:
id: app-token-generation
uses: getsentry/action-github-app-token@d4b5da6c5e37703f8c3b3e43abb5705b46e159cc
with:
repository: spacestation13/tgstation-server
app_id: ${{ secrets.APP_ID }}
private_key: ${{ secrets.APP_PRIVATE_KEY }}

Expand Down

0 comments on commit 88a820e

Please sign in to comment.