From 5cf8f3b4e114ae86839efda12dd7e39ca2b6845b Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Sun, 4 Aug 2024 11:14:46 -0400 Subject: [PATCH 1/2] Add missing setup-dotnet step to master merge workflow --- .github/workflows/stable-merge.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/stable-merge.yml b/.github/workflows/stable-merge.yml index bec358aca76..b202176614d 100644 --- a/.github/workflows/stable-merge.yml +++ b/.github/workflows/stable-merge.yml @@ -11,6 +11,12 @@ jobs: name: Master Merge runs-on: ubuntu-latest steps: + - name: Setup dotnet + uses: actions/setup-dotnet@v4 + with: + dotnet-version: '${{ env.TGS_DOTNET_VERSION }}.0.x' + dotnet-quality: ${{ env.TGS_DOTNET_QUALITY }} + - name: Build Checkout uses: actions/checkout@v4 with: From 492bcbe919e89f956f2738012ec8c8d6e7a84546 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Sun, 4 Aug 2024 22:33:09 -0400 Subject: [PATCH 2/2] Fix master merge bot committer e-mail --- .github/workflows/stable-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stable-merge.yml b/.github/workflows/stable-merge.yml index b202176614d..bea96f903b9 100644 --- a/.github/workflows/stable-merge.yml +++ b/.github/workflows/stable-merge.yml @@ -55,7 +55,7 @@ jobs: allow_ff: true allow_forks: true user_name: tgstation-server-ci[bot] - user_email: 847638+tgstation-server-ci[bot]@users.noreply.github.com + user_email: 161980869+tgstation-server-ci[bot]@users.noreply.github.com push_token: INSTALLATION_TOKEN env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}