From e22eeb0181777aa485601745349663ff0c033451 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Mon, 16 Dec 2024 18:14:15 -0500 Subject: [PATCH 1/3] Post 6.12 CI fixes --- .github/workflows/ci-pipeline.yml | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci-pipeline.yml b/.github/workflows/ci-pipeline.yml index c3fd6c6604..d592037966 100644 --- a/.github/workflows/ci-pipeline.yml +++ b/.github/workflows/ci-pipeline.yml @@ -2337,8 +2337,16 @@ jobs: with: nix_path: nixpkgs=channel:nixos-unstable - - name: Checkout - uses: actions/checkout@v4 + - name: Generate App Token + id: app-token-generation + uses: actions/create-github-app-token@v1 + with: + repositories: tgstation-ppa + app-id: ${{ secrets.APP_ID }} + private-key: ${{ secrets.APP_PRIVATE_KEY }} + + - name: Clone + run: git clone -b master --single-branch "https://git@github.com/tgstation/tgstation-server" --depth 1 . - name: Parse TGS version run: echo "TGS_VERSION=$(xmlstarlet sel -N X="http://schemas.microsoft.com/developer/msbuild/2003" --template --value-of /X:Project/X:PropertyGroup/X:TgsCoreVersion build/Version.props)" >> $GITHUB_ENV @@ -2366,10 +2374,10 @@ jobs: run: git tag -a tgstation-server-v${{ env.TGS_VERSION }} -m tgstation-server-v${{ env.TGS_VERSION }} - name: Push Commit - run: git push + run: git push "https://tgstation-server-ci:${{ steps.app-token-generation.outputs.token }}@github.com/tgstation/tgstation-server" - name: Force Push Tags - run: git push -f --tags + run: git push -f --tags "https://tgstation-server-ci:${{ steps.app-token-generation.outputs.token }}@github.com/tgstation/tgstation-server" changelog-regen: name: Regenerate Changelog @@ -2516,8 +2524,8 @@ jobs: shell: powershell run: Sleep 600 - - name: Ensure Latest Release is TGS Release + - name: Update Winget PR with automated message env: - TGS_RELEASE_NOTES_TOKEN: ${{ secrets.DEV_PUSH_TOKEN }} # Has to be a user here + TGS_RELEASE_NOTES_TOKEN: ${{ secrets.DEV_PUSH_TOKEN }} # Has to be the user that opened the PR shell: powershell run: dotnet release_notes_bins/Tgstation.Server.ReleaseNotes.dll --link-winget ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} From e8233b18526240b44ef8cfba7ae4e4a6e21e0bce Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Mon, 16 Dec 2024 18:15:23 -0500 Subject: [PATCH 2/3] Force push tags on fork sync --- .github/workflows/update-ss13-org-mirror.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-ss13-org-mirror.yml b/.github/workflows/update-ss13-org-mirror.yml index e7e2123a05..3fef53441d 100644 --- a/.github/workflows/update-ss13-org-mirror.yml +++ b/.github/workflows/update-ss13-org-mirror.yml @@ -39,4 +39,4 @@ jobs: git config user.name "tgstation-server-ci[bot]" git config user.email "161980869+tgstation-server-ci[bot]@users.noreply.github.com" git push "https://tgstation-server-ci:${{ steps.app-token-generation.outputs.token }}@github.com/spacestation13/tgstation-server" - git push --tags "https://tgstation-server-ci:${{ steps.app-token-generation.outputs.token }}@github.com/spacestation13/tgstation-server" + git push -f --tags "https://tgstation-server-ci:${{ steps.app-token-generation.outputs.token }}@github.com/spacestation13/tgstation-server" From a7bae6f2bb9ec5e38e3d0711b84598830beadea3 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Mon, 16 Dec 2024 18:19:42 -0500 Subject: [PATCH 3/3] We need the code coverage to always run or there will be issues --- .github/workflows/ci-pipeline.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci-pipeline.yml b/.github/workflows/ci-pipeline.yml index d592037966..0a171cb9c5 100644 --- a/.github/workflows/ci-pipeline.yml +++ b/.github/workflows/ci-pipeline.yml @@ -50,7 +50,6 @@ jobs: start-gate: name: CI Start Gate runs-on: ubuntu-latest - if: (!contains(github.event.head_commit.message, '[TGSRelease]')) steps: - name: GitHub Requires at Least One Step for a Job run: exit 0 @@ -2368,7 +2367,7 @@ jobs: git config user.name "tgstation-server-ci[bot]" git config user.email "161980869+tgstation-server-ci[bot]@users.noreply.github.com" git add build/package/nix/ServerConsole.sha256 - git commit -m "Update nix SHA256 for [TGSRelease] v${{ env.TGS_VERSION }}" + git commit -m "Update nix SHA256 for TGS v${{ env.TGS_VERSION }}" - name: Re-tag run: git tag -a tgstation-server-v${{ env.TGS_VERSION }} -m tgstation-server-v${{ env.TGS_VERSION }}