Merge branch 'master' into dev

tgstation · Dec 20, 2024 · f3bfa22 · f3bfa22
2 parents df7ec6e + 12d89d6
commit f3bfa22
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/ci-pipeline.yml b/.github/workflows/ci-pipeline.yml
@@ -2370,7 +2370,9 @@ jobs:
           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 }}
+        run: |
+          git tag -d tgstation-server-v${{ env.TGS_VERSION }}
+          git tag -a tgstation-server-v${{ env.TGS_VERSION }} -m tgstation-server-v${{ env.TGS_VERSION }}
 
       - name: Push Commit
         run: git push "https://tgstation-server-ci:${{ steps.app-token-generation.outputs.token }}@github.com/tgstation/tgstation-server"

diff --git a/build/Version.props b/build/Version.props
@@ -3,7 +3,7 @@
   <!-- Integration tests will ensure they match across the board -->
   <Import Project="WebpanelVersion.props" />
   <PropertyGroup>
-    <TgsCoreVersion>6.12.1</TgsCoreVersion>
+    <TgsCoreVersion>6.12.2</TgsCoreVersion>
     <TgsConfigVersion>5.4.0</TgsConfigVersion>
     <TgsRestVersion>10.12.0</TgsRestVersion>
     <TgsGraphQLVersion>0.5.0</TgsGraphQLVersion>