Skip to content

Commit

Permalink
Fix workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
Xzonn committed Sep 30, 2024
1 parent da96d50 commit 5e61f41
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 23 deletions.
22 changes: 5 additions & 17 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,26 +15,14 @@ jobs:
compile-binaries:
runs-on: ubuntu-latest
container:
image: devkitpro/devkitarm:latest
image: xzonn/devkitarm:latest
steps:
- uses: actions/checkout@v4
with:
submodules: recursive
- uses: actions/setup-python@v5
with:
python-version: '3.12'
- uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
- name: Install dotnet script
run: |
dotnet tool install -g dotnet-script
- name: Get tools commit id
id: get-tools-commit-id
run: |
pushd tools/
echo "id=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
popd
- name: Merge messages
run: |
python scripts/merge_messages.py
Expand All @@ -43,19 +31,19 @@ jobs:
- name: Diamond and Pearl
continue-on-error: true
run: |
dotnet script scripts/DP.csx
dotnet-script scripts/DP.csx
env:
XZ_PATCH_VERSION: "${{ github.sha }}"
- name: Platinum
continue-on-error: true
run: |
dotnet script scripts/Pt.csx
dotnet-script scripts/Pt.csx
env:
XZ_PATCH_VERSION: "${{ github.sha }}"
- name: Heart Gold and Soul Silver
continue-on-error: true
run: |
dotnet script scripts/HGSS.csx
dotnet-script scripts/HGSS.csx
env:
XZ_PATCH_VERSION: "${{ github.sha }}"
- name: Upload artifacts
Expand Down Expand Up @@ -166,4 +154,4 @@ jobs:
name: "${{ steps.commit.outputs.commit_message }}"
prerelease: true
tag: dev-pub
token: ${{ secrets.GITHUB_TOKEN }}
token: ${{ secrets.GITHUB_TOKEN }}
4 changes: 2 additions & 2 deletions .github/workflows/build_on_push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Build on push

on:
push:
branches:
branches:
- master
paths-ignore:
- '*.md'
Expand All @@ -21,4 +21,4 @@ jobs:
build:
uses: ./.github/workflows/build.yml
with:
publish: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
publish: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
1 change: 0 additions & 1 deletion LICENSE.texts.txt
Original file line number Diff line number Diff line change
Expand Up @@ -358,4 +358,3 @@ Creative Commons Notice
this trademark restriction does not form part of this License.

Creative Commons may be contacted at https://creativecommons.org/.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@

## 相关内容
- [PCTRTools](https://github.com/Xzonn/PCTRTools):汉化修正工具。
- [NitroPatcher](https://github.com/Xzonn/NitroPatcher):补丁应用工具。
- [NitroPatcher](https://github.com/Xzonn/NitroPatcher):补丁应用工具。
2 changes: 1 addition & 1 deletion textures/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
*.png
*.psd
*.psd
2 changes: 1 addition & 1 deletion textures/HGSS/.gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
a/0/0/8/
a/0/3/9/
a/0/6/7/
a/0/7/4/
a/0/7/4/

0 comments on commit 5e61f41

Please sign in to comment.