Skip to content

Commit 3685952

Browse files
committed
Run a Redist Tool from UnturnedRedistUpdateTool/releases/latest
Do not build the tool manually anymore. Use only the unit tested & pre-built & released one
1 parent 6d22cee commit 3685952

5 files changed

Lines changed: 66 additions & 55 deletions

File tree

.github/workflows/Unturned.Redist.Client-Preview.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,14 @@ jobs:
2525
with:
2626
ref: master
2727

28-
- name: Checkout tools
29-
uses: actions/checkout@v4
28+
- name: Download tool release
29+
uses: robinraju/release-downloader@v1
3030
with:
3131
repository: RocketModFix/UnturnedRedistUpdateTool
32-
path: tools
32+
tag: latest
33+
fileName: UnturnedRedistUpdateTool.zip
34+
out-file-path: redist_tool
35+
extract: true
3336

3437
- name: Setup SteamCMD
3538
id: setup-steamcmd
@@ -47,16 +50,13 @@ jobs:
4750
with:
4851
dotnet-version: 9.x
4952

50-
- name: Install dependencies
51-
run: dotnet restore tools/UnturnedRedistUpdateTool/
52-
5353
- name: Run auto-updater (force)
5454
if: ${{ github.event_name == 'workflow_dispatch' }}
55-
run: dotnet run --project ./tools/UnturnedRedistUpdateTool/UnturnedRedistUpdateTool.csproj --configuration Release -- $GITHUB_WORKSPACE $REDIST_DIR $APP_ID --force
55+
run: dotnet redist_tool/UnturnedRedistUpdateTool/UnturnedRedistUpdateTool.dll "$GITHUB_WORKSPACE" "$REDIST_DIR" "$APP_ID" --force
5656

5757
- name: Run auto-updater (schedule)
5858
if: ${{ github.event_name == 'schedule' }}
59-
run: dotnet run --project ./tools/UnturnedRedistUpdateTool/UnturnedRedistUpdateTool.csproj --configuration Release -- $GITHUB_WORKSPACE $REDIST_DIR $APP_ID
59+
run: dotnet redist_tool/UnturnedRedistUpdateTool/UnturnedRedistUpdateTool.dll "$GITHUB_WORKSPACE" "$REDIST_DIR" "$APP_ID"
6060

6161
- name: Generate Commit Message
6262
run: |
@@ -69,7 +69,7 @@ jobs:
6969
git config --global user.name "sunnamed434"
7070
7171
git add -A
72-
git reset README.md # Prevents adding changes to README.md, steamcmd rewrites it by some reason.
72+
git reset README.md # Reset README.md, cause steamcmd override it.
7373
git status
7474
git commit -m "${{ steps.generate_commit_message.outputs.message }}"
7575
git push

.github/workflows/Unturned.Redist.Client.yaml

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,14 @@ jobs:
2525
with:
2626
ref: master
2727

28-
- name: Checkout tools
29-
uses: actions/checkout@v4
28+
- name: Download tool release
29+
uses: robinraju/release-downloader@v1
3030
with:
3131
repository: RocketModFix/UnturnedRedistUpdateTool
32-
path: tools
33-
34-
- name: Setup SteamCMD
35-
id: setup-steamcmd
36-
uses: CyberAndrii/setup-steamcmd@v1
37-
38-
- name: Update app
39-
run: steamcmd +force_install_dir $GITHUB_WORKSPACE +login ${{ secrets.STEAM_USERNAME }} ${{ secrets.STEAM_PASSWORD }} +app_update $APP_ID -validate +quit
32+
tag: latest
33+
fileName: UnturnedRedistUpdateTool.zip
34+
out-file-path: redist_tool
35+
extract: true
4036

4137
- name: Setup .NET
4238
uses: actions/setup-dotnet@v4
@@ -46,17 +42,30 @@ jobs:
4642
DOTNET_CLI_TELEMETRY_OPTOUT: true
4743
with:
4844
dotnet-version: 9.x
49-
50-
- name: Install dependencies
51-
run: dotnet restore tools/UnturnedRedistUpdateTool/
45+
46+
- name: Download tool release
47+
uses: robinraju/release-downloader@v1
48+
with:
49+
repository: RocketModFix/UnturnedRedistUpdateTool
50+
tag: latest
51+
fileName: UnturnedRedistUpdateTool.zip
52+
out-file-path: redist_tool
53+
extract: true
54+
55+
- name: Setup SteamCMD
56+
id: setup-steamcmd
57+
uses: CyberAndrii/setup-steamcmd@v1
58+
59+
- name: Update app
60+
run: steamcmd +force_install_dir $GITHUB_WORKSPACE +login ${{ secrets.STEAM_USERNAME }} ${{ secrets.STEAM_PASSWORD }} +app_update $APP_ID -validate +quit
5261

5362
- name: Run auto-updater (force)
5463
if: ${{ github.event_name == 'workflow_dispatch' }}
55-
run: dotnet run --project ./tools/UnturnedRedistUpdateTool/UnturnedRedistUpdateTool.csproj --configuration Release -- $GITHUB_WORKSPACE $REDIST_DIR $APP_ID --force
64+
run: dotnet redist_tool/UnturnedRedistUpdateTool/UnturnedRedistUpdateTool.dll "$GITHUB_WORKSPACE" "$REDIST_DIR" "$APP_ID" --force
5665

5766
- name: Run auto-updater (schedule)
5867
if: ${{ github.event_name == 'schedule' }}
59-
run: dotnet run --project ./tools/UnturnedRedistUpdateTool/UnturnedRedistUpdateTool.csproj --configuration Release -- $GITHUB_WORKSPACE $REDIST_DIR $APP_ID
68+
run: dotnet redist_tool/UnturnedRedistUpdateTool/UnturnedRedistUpdateTool.dll "$GITHUB_WORKSPACE" "$REDIST_DIR" "$APP_ID"
6069

6170
- name: Generate Commit Message
6271
run: |
@@ -69,7 +78,7 @@ jobs:
6978
git config --global user.name "sunnamed434"
7079
7180
git add -A
72-
git reset README.md # Prevents adding changes to README.md, steamcmd rewrites it by some reason.
81+
git reset README.md # Reset README.md, cause steamcmd override it.
7382
git status
7483
git commit -m "${{ steps.generate_commit_message.outputs.message }}"
7584
git push

.github/workflows/Unturned.Redist.Server-Preview.yaml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,14 @@ jobs:
2525
with:
2626
ref: master
2727

28-
- name: Checkout tools
29-
uses: actions/checkout@v4
28+
- name: Download tool release
29+
uses: robinraju/release-downloader@v1
3030
with:
3131
repository: RocketModFix/UnturnedRedistUpdateTool
32-
path: tools
33-
34-
- name: Setup SteamCMD
35-
id: setup-steamcmd
36-
uses: CyberAndrii/setup-steamcmd@v1
37-
38-
- name: Update app
39-
run: steamcmd +force_install_dir $GITHUB_WORKSPACE +login ${{ secrets.STEAM_USERNAME }} ${{ secrets.STEAM_PASSWORD }} +app_update $APP_ID -beta preview -validate +quit
32+
tag: latest
33+
fileName: UnturnedRedistUpdateTool.zip
34+
out-file-path: redist_tool
35+
extract: true
4036

4137
- name: Setup .NET
4238
uses: actions/setup-dotnet@v4
@@ -47,16 +43,20 @@ jobs:
4743
with:
4844
dotnet-version: 9.x
4945

50-
- name: Install dependencies
51-
run: dotnet restore tools/UnturnedRedistUpdateTool/
46+
- name: Setup SteamCMD
47+
id: setup-steamcmd
48+
uses: CyberAndrii/setup-steamcmd@v1
49+
50+
- name: Update app
51+
run: steamcmd +force_install_dir $GITHUB_WORKSPACE +login ${{ secrets.STEAM_USERNAME }} ${{ secrets.STEAM_PASSWORD }} +app_update $APP_ID -beta preview -validate +quit
5252

5353
- name: Run auto-updater (force)
5454
if: ${{ github.event_name == 'workflow_dispatch' }}
55-
run: dotnet run --project ./tools/UnturnedRedistUpdateTool/UnturnedRedistUpdateTool.csproj --configuration Release -- $GITHUB_WORKSPACE $REDIST_DIR $APP_ID --force
55+
run: dotnet redist_tool/UnturnedRedistUpdateTool/UnturnedRedistUpdateTool.dll "$GITHUB_WORKSPACE" "$REDIST_DIR" "$APP_ID" --force
5656

5757
- name: Run auto-updater (schedule)
5858
if: ${{ github.event_name == 'schedule' }}
59-
run: dotnet run --project ./tools/UnturnedRedistUpdateTool/UnturnedRedistUpdateTool.csproj --configuration Release -- $GITHUB_WORKSPACE $REDIST_DIR $APP_ID
59+
run: dotnet redist_tool/UnturnedRedistUpdateTool/UnturnedRedistUpdateTool.dll "$GITHUB_WORKSPACE" "$REDIST_DIR" "$APP_ID"
6060

6161
- name: Generate Commit Message
6262
run: |
@@ -69,7 +69,7 @@ jobs:
6969
git config --global user.name "sunnamed434"
7070
7171
git add -A
72-
git reset README.md # Prevents adding changes to README.md, steamcmd rewrites it by some reason.
72+
git reset README.md # Reset README.md, cause steamcmd override it.
7373
git status
7474
git commit -m "${{ steps.generate_commit_message.outputs.message }}"
7575
git push

.github/workflows/Unturned.Redist.Server.yaml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,14 @@ jobs:
2525
with:
2626
ref: master
2727

28-
- name: Checkout tools
29-
uses: actions/checkout@v4
28+
- name: Download tool release
29+
uses: robinraju/release-downloader@v1
3030
with:
3131
repository: RocketModFix/UnturnedRedistUpdateTool
32-
path: tools
33-
34-
- name: Setup SteamCMD
35-
id: setup-steamcmd
36-
uses: CyberAndrii/setup-steamcmd@v1
37-
38-
- name: Update app
39-
run: steamcmd +force_install_dir $GITHUB_WORKSPACE +login ${{ secrets.STEAM_USERNAME }} ${{ secrets.STEAM_PASSWORD }} +app_update $APP_ID -validate +quit
32+
tag: latest
33+
fileName: UnturnedRedistUpdateTool.zip
34+
out-file-path: redist_tool
35+
extract: true
4036

4137
- name: Setup .NET
4238
uses: actions/setup-dotnet@v4
@@ -47,16 +43,20 @@ jobs:
4743
with:
4844
dotnet-version: 9.x
4945

50-
- name: Install dependencies
51-
run: dotnet restore tools/UnturnedRedistUpdateTool/
46+
- name: Setup SteamCMD
47+
id: setup-steamcmd
48+
uses: CyberAndrii/setup-steamcmd@v1
49+
50+
- name: Update app
51+
run: steamcmd +force_install_dir $GITHUB_WORKSPACE +login ${{ secrets.STEAM_USERNAME }} ${{ secrets.STEAM_PASSWORD }} +app_update $APP_ID -validate +quit
5252

5353
- name: Run auto-updater (force)
5454
if: ${{ github.event_name == 'workflow_dispatch' }}
55-
run: dotnet run --project ./tools/UnturnedRedistUpdateTool/UnturnedRedistUpdateTool.csproj --configuration Release -- $GITHUB_WORKSPACE $REDIST_DIR $APP_ID --force
55+
run: dotnet redist_tool/UnturnedRedistUpdateTool/UnturnedRedistUpdateTool.dll "$GITHUB_WORKSPACE" "$REDIST_DIR" "$APP_ID" --force
5656

5757
- name: Run auto-updater (schedule)
5858
if: ${{ github.event_name == 'schedule' }}
59-
run: dotnet run --project ./tools/UnturnedRedistUpdateTool/UnturnedRedistUpdateTool.csproj --configuration Release -- $GITHUB_WORKSPACE $REDIST_DIR $APP_ID
59+
run: dotnet redist_tool/UnturnedRedistUpdateTool/UnturnedRedistUpdateTool.dll "$GITHUB_WORKSPACE" "$REDIST_DIR" "$APP_ID"
6060

6161
- name: Generate Commit Message
6262
run: |
@@ -69,7 +69,7 @@ jobs:
6969
git config --global user.name "sunnamed434"
7070
7171
git add -A
72-
git reset README.md # Prevents adding changes to README.md, steamcmd rewrites it by some reason.
72+
git reset README.md # Reset README.md, cause steamcmd override it.
7373
git status
7474
git commit -m "${{ steps.generate_commit_message.outputs.message }}"
7575
git push

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
/redist_tool/
2+
13
# Steam Linux Runtime (SLR)
24
/mtree.txt.gz
35
/run-in-scout-on-soldier

0 commit comments

Comments
 (0)