Merge branch 'master' into dev

This commit is contained in:
tgstation-server
2023-06-10 00:05:52 +00:00
5 changed files with 42 additions and 10 deletions
@@ -16,7 +16,7 @@ concurrency:
jobs:
approve-pr-if-dominion-is-author:
name: Approve PR if Dominion is Author
if: github.event.pull_request.user.login == 'Cyberboss'
if: github.event.pull_request.user.login == 'Cyberboss' && (github.event.pull_request.base.repo.owner.login == 'tgstation' || && github.event.pull_request.base.repo.owner.login == 'Cyberboss')
runs-on: ubuntu-latest
steps:
- name: GitHub API Call
+1
View File
@@ -21,6 +21,7 @@ env:
TGS_DOTNET_VERSION: 6.0.x
TGS_TEST_GITHUB_TOKEN: ${{ secrets.LIVE_TESTS_TOKEN }}
TGS_RELEASE_NOTES_TOKEN: ${{ secrets.DEV_PUSH_TOKEN }}
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
concurrency:
group: "ci-${{ github.head_ref || github.run_id }}-${{ github.event_name }}"
+8 -1
View File
@@ -2,7 +2,7 @@ name: 'Code Scanning'
on:
schedule:
- cron: 0 23 * * *
- cron: 0 23 * * 1
push:
branches:
- dev
@@ -20,6 +20,11 @@ jobs:
analyze:
name: Code Scanning
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write
if: ${{ vars.TGS_ENABLE_CODE_QL }} == 'true'
steps:
- name: Install Node 12.X
uses: actions/setup-node@v3
@@ -42,3 +47,5 @@ jobs:
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
with:
category: "/language:csharp"