From 2ca494e90699c47d73b51a9d554d8976c4b30acd Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Sat, 13 Jul 2024 19:40:53 -0400 Subject: [PATCH] Switch back to basic pushes from me --- .github/workflows/stable-merge.yml | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/.github/workflows/stable-merge.yml b/.github/workflows/stable-merge.yml index 1edf863566..f3f189a06d 100644 --- a/.github/workflows/stable-merge.yml +++ b/.github/workflows/stable-merge.yml @@ -8,7 +8,7 @@ on: workflow_dispatch: env: - TGS_RELEASE_NOTES_TOKEN: ${{ secrets.DEV_PUSH_TOKEN }} + DEV_PUSH_TOKEN: ${{ secrets.DEV_PUSH_TOKEN }} jobs: master-merge: @@ -19,19 +19,6 @@ jobs: uses: actions/checkout@v4 with: fetch-depth: 0 - - - name: Restore - run: dotnet restore - - - 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 - 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 - run: echo "INSTALLATION_TOKEN=$(cat ${{ runner.temp }}/installation_secret.txt)" >> $GITHUB_ENV - - name: Merge master into dev uses: robotology/gh-action-nightly-merge@14b4a4cf358f7479aa708bee05cf8a794d6a2516 #v1.5.0 with: @@ -41,6 +28,6 @@ jobs: allow_forks: true user_name: tgstation-server user_email: tgstation-server@users.noreply.github.com - push_token: INSTALLATION_TOKEN + push_token: DEV_PUSH_TOKEN env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}