From 2957ed514f0cb9b9e9095d914b3827095be6ee89 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Thu, 17 Aug 2023 20:27:20 -0400 Subject: [PATCH 1/4] Bring client version in line It should have been bumped in 29f5e877737d6fc760ecd0efd2eb78cf7f0a3b60 --- build/Version.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Version.props b/build/Version.props index 50901525b3..c4ec1b6b4b 100644 --- a/build/Version.props +++ b/build/Version.props @@ -8,7 +8,7 @@ 9.12.0 6.0.0 11.1.0 - 12.0.1 + 12.1.0 6.5.2 5.6.1 1.4.0 From 5226744108bc2eef41332ac83026a8d3bda410e8 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Mon, 21 Aug 2023 10:19:50 -0400 Subject: [PATCH 2/4] Fix gh-pages push step --- .github/workflows/ci-pipeline.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-pipeline.yml b/.github/workflows/ci-pipeline.yml index 2f184995e6..51ee3d91d3 100644 --- a/.github/workflows/ci-pipeline.yml +++ b/.github/workflows/ci-pipeline.yml @@ -197,7 +197,7 @@ jobs: - name: Build Changelog (Incremental) run: | - cp $HOME/tgsdox/changelog.yml ./ 2>/dev/null + mv $HOME/tgsdox/changelog.yml ./ 2>/dev/null dotnet run -c Release --no-build --project tools/Tgstation.Server.ReleaseNotes --generate-full-notes - name: Patch Doxyfile @@ -213,10 +213,10 @@ jobs: - name: gh-pages Push if: github.event_name == 'push' && github.event.ref == 'refs/heads/dev' && env.TGS_RELEASE_NOTES_TOKEN != '' run: | + sudo mv changlog.yml $HOME/tgsdox/ pushd $HOME/tgsdox rm -r * popd - sudo mv changlog.yml $HOME/tgsdox/ echo ./doxout/* | xargs -n 10 sudo mv -t $HOME/tgsdox cd $HOME/tgsdox git config --global push.default simple From 4b0c212a759754418ba673391f70d420152ac92d Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Mon, 21 Aug 2023 13:45:50 -0400 Subject: [PATCH 3/4] Revert "Workaround for https://github.com/microsoft/winget-create/issues/429" This reverts commit e71ef39db939a4ff580008f21f8a95ada6aef78c. --- .github/workflows/ci-pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-pipeline.yml b/.github/workflows/ci-pipeline.yml index 51ee3d91d3..4a2a18ba65 100644 --- a/.github/workflows/ci-pipeline.yml +++ b/.github/workflows/ci-pipeline.yml @@ -1712,7 +1712,7 @@ jobs: GITHUB_TOKEN: ${{ env.WINGET_PUSH_TOKEN }} - name: Install wingetcreate - run: winget install wingetcreate --version 1.2.8.0 --disable-interactivity --accept-source-agreements # Pinned due to https://github.com/microsoft/winget-create/issues/429 + run: winget install wingetcreate --disable-interactivity --accept-source-agreements - name: Checkout uses: actions/checkout@v3 From 2d02b2f8d8ac92481e9db87dea6b152499b82fdb Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Mon, 21 Aug 2023 13:47:14 -0400 Subject: [PATCH 4/4] Fix typo in gh-pages push --- .github/workflows/ci-pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-pipeline.yml b/.github/workflows/ci-pipeline.yml index 4a2a18ba65..b06cc8b1da 100644 --- a/.github/workflows/ci-pipeline.yml +++ b/.github/workflows/ci-pipeline.yml @@ -213,7 +213,7 @@ jobs: - name: gh-pages Push if: github.event_name == 'push' && github.event.ref == 'refs/heads/dev' && env.TGS_RELEASE_NOTES_TOKEN != '' run: | - sudo mv changlog.yml $HOME/tgsdox/ + sudo mv changelog.yml $HOME/tgsdox/ pushd $HOME/tgsdox rm -r * popd