cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-24 13:36:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixing up master merge

Browse Source
This commit is contained in:
Jordan Dominion
2024-07-13 13:03:26 -04:00
parent a2e4582ea0
commit b6967cfab6
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/stable-merge.yml
+2 -2
View File
@@ -10,7 +10,7 @@ on:
jobs:
master-merge:
runs-on: ubuntu-latest
if: ${{ github.event_name == 'workflow_dispatch' }} || ${{ github.event.workflow_run.conclusion == 'success' }}
if: github.event_name == 'workflow_dispatch' || (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success')
steps:
- name: Checkout
uses: actions/checkout@v4
@@ -23,7 +23,7 @@ jobs:
- name: Build ReleaseNotes
run: dotnet build -c Release -p:TGS_HOST_NO_WEBPANEL=true tools/Tgstation.Server.ReleaseNotes/Tgstation.Server.ReleaseNotes.csproj
- name: Run ReleaseNotes Create CI Completion Check (PR HEAD)
- name: Run ReleaseNotes Create CI Completion Check
run: dotnet run -c Release --no-build --project tools/Tgstation.Server.ReleaseNotes --token-output-file ${{ runner.temp }}/installation_secret.txt ${{ secrets.TGS_CI_GITHUB_APP_TOKEN_BASE64 }}
- name: Load Installation Token into Envvar