cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-29 08:00:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
tgstation-server
2023-06-21 01:24:04 +00:00
parent e622d1eed6 0d81bac263
commit 176163da32
5 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/ci-suite.yml
+12 -12
View File
@@ -950,7 +950,7 @@ jobs:
path: swagger
- name: Create GitHub Release
uses: juitnow/github-action-create-release@v1
uses: juitnow/github-action-create-release@80dc88a9d09c0ee394a4a31b0450e8cbe62996ef # v1
id: create_release
env:
GITHUB_TOKEN: ${{ secrets.DEV_PUSH_TOKEN }}
@@ -1026,24 +1026,24 @@ jobs:
- name: Checkout
uses: actions/checkout@v3
- name: Publish Tgstation.Server.Api to NuGet
uses: alirezanet/publish-nuget@v3.0.0
with:
PROJECT_FILE_PATH: src/Tgstation.Server.Api/Tgstation.Server.Api.csproj
TAG_COMMIT: false
INCLUDE_SYMBOLS: true
NUGET_KEY: ${{ secrets.NUGET_API_KEY }}
- name: Publish Tgstation.Server.Common to NuGet
uses: alirezanet/publish-nuget@v3.0.0
uses: alirezanet/publish-nuget@c12b8546b67672ee38ac87bea491ac94a587f7cc # v3.0.0
with:
PROJECT_FILE_PATH: src/Tgstation.Server.Client/Tgstation.Server.Client.csproj
TAG_COMMIT: false
INCLUDE_SYMBOLS: true
NUGET_KEY: ${{ secrets.NUGET_API_KEY }}
- name: Publish Tgstation.Server.Api to NuGet
uses: alirezanet/publish-nuget@c12b8546b67672ee38ac87bea491ac94a587f7cc # v3.0.0
with:
PROJECT_FILE_PATH: src/Tgstation.Server.Api/Tgstation.Server.Api.csproj
TAG_COMMIT: false
INCLUDE_SYMBOLS: true
NUGET_KEY: ${{ secrets.NUGET_API_KEY }}
- name: Publish Tgstation.Server.Client to NuGet
uses: alirezanet/publish-nuget@v3.0.0
uses: alirezanet/publish-nuget@c12b8546b67672ee38ac87bea491ac94a587f7cc # v3.0.0
with:
PROJECT_FILE_PATH: src/Tgstation.Server.Common/Tgstation.Server.Common.csproj
TAG_COMMIT: false
@@ -1233,7 +1233,7 @@ jobs:
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
- name: Docker Build and Push
uses: elgohr/Publish-Docker-Github-Action@v5
uses: elgohr/Publish-Docker-Github-Action@43dc228e327224b2eda11c8883232afd5b34943b # v5
with:
name: tgstation/server
username: ${{ secrets.DOCKER_USERNAME }}
.github/workflows/stable-merge.yml
+1 -1
View File
@@ -15,7 +15,7 @@ jobs:
uses: actions/checkout@v1
- name: Merge master into dev
uses: robotology/gh-action-nightly-merge@v1.3.3
uses: robotology/gh-action-nightly-merge@22f5e45d028f22837d617fa07512925457eec184 #v1.3.3
with:
stable_branch: 'master'
development_branch: 'dev'