Skip to content

Commit ed689a6

Browse files
committed
Update GH actions to use new game build
1 parent 6570d52 commit ed689a6

File tree

2 files changed

+19
-5
lines changed

2 files changed

+19
-5
lines changed

.github/workflows/prerelease.yaml renamed to .github/workflows/prerelease.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,27 @@ on:
44
push:
55
branches-ignore:
66
- master
7+
workflow_dispatch:
8+
inputs:
9+
message:
10+
description: 'Release note'
11+
required: true
712

813
jobs:
914
build:
1015
name: Run Build
11-
uses: OxideMod/Actions/.github/workflows/game-build.yaml@main
16+
uses: OxideMod/Actions/.github/workflows/game-build.yml@main
1217
with:
1318
game: "Rust"
1419
branch-postfix: "-${{ github.ref_name }}"
1520
secrets:
21+
DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
22+
NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
1623
REPO_ACCESS_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
1724

1825
deploy:
1926
name: Deploy to S3
20-
uses: OxideMod/Actions/.github/workflows/r2-publish.yaml@main
27+
uses: OxideMod/Actions/.github/workflows/r2-publish.yml@main
2128
needs: build
2229
with:
2330
generate-filehash: true

.github/workflows/release.yaml renamed to .github/workflows/release.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,21 @@ on:
44
push:
55
branches:
66
- master
7+
workflow_dispatch:
8+
inputs:
9+
message:
10+
description: 'Release note'
11+
required: true
712

813
jobs:
914
build:
1015
name: Run Build
11-
uses: OxideMod/Actions/.github/workflows/game-build.yaml@main
16+
uses: OxideMod/Actions/.github/workflows/game-build.yml@main
1217
with:
1318
game: "Rust"
1419
secrets:
20+
DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
21+
NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
1522
REPO_ACCESS_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
1623

1724
release:
@@ -30,7 +37,7 @@ jobs:
3037
with:
3138
files: |
3239
artifacts/Oxide.*.zip
33-
tag_name: 2.0.${{ vars.VERSION }}
40+
tag_name: ${{ needs.build.outputs.version }}
3441
fail_on_unmatched_files: true
3542
token: ${{ secrets.GITHUB_TOKEN }}
3643
body: |
@@ -56,5 +63,5 @@ jobs:
5663
git config --global user.email [email protected]
5764
git config --global user.name oxidemod-bot
5865
git add docs.json
59-
git diff-index --quiet HEAD || git commit -m "Update hooks index to 2.0.${{ vars.VERSION }}"
66+
git diff-index --quiet HEAD || git commit -m "Update hooks index to ${{ needs.build.outputs.version }}"
6067
git push

0 commit comments

Comments
 (0)