From 8051ae8fc417df61b90dbc35c0686786bf032250 Mon Sep 17 00:00:00 2001 From: Xzonn Date: Mon, 30 Sep 2024 10:40:25 +0800 Subject: [PATCH] Fix workflow --- .github/workflows/build.yml | 14 ++++++-------- .github/workflows/build_on_push.yml | 4 ++-- LICENSE.texts.txt | 1 - README.md | 2 +- textures/.gitignore | 2 +- textures/HGSS/.gitignore | 2 +- 6 files changed, 11 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 41b45e2c5..542ec7be1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,7 @@ jobs: compile-binaries: runs-on: ubuntu-latest container: - image: devkitpro/devkitarm:latest + image: xzonn/devkitarm:latest steps: - uses: actions/checkout@v4 with: @@ -29,12 +29,10 @@ jobs: - 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 + cat << EOF >> ~/.bash_profile + # Add .NET Core SDK tools + export PATH="$PATH:/github/home/.dotnet/tools" + EOF - name: Merge messages run: | python scripts/merge_messages.py @@ -166,4 +164,4 @@ jobs: name: "${{ steps.commit.outputs.commit_message }}" prerelease: true tag: dev-pub - token: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/build_on_push.yml b/.github/workflows/build_on_push.yml index c1531d219..e658c9fe7 100644 --- a/.github/workflows/build_on_push.yml +++ b/.github/workflows/build_on_push.yml @@ -2,7 +2,7 @@ name: Build on push on: push: - branches: + branches: - master paths-ignore: - '*.md' @@ -21,4 +21,4 @@ jobs: build: uses: ./.github/workflows/build.yml with: - publish: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }} \ No newline at end of file + publish: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }} diff --git a/LICENSE.texts.txt b/LICENSE.texts.txt index 46c819167..a50eacf98 100644 --- a/LICENSE.texts.txt +++ b/LICENSE.texts.txt @@ -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/. - diff --git a/README.md b/README.md index c5757b725..ea143946d 100644 --- a/README.md +++ b/README.md @@ -15,4 +15,4 @@ ## 相关内容 - [PCTRTools](https://github.com/Xzonn/PCTRTools):汉化修正工具。 -- [NitroPatcher](https://github.com/Xzonn/NitroPatcher):补丁应用工具。 \ No newline at end of file +- [NitroPatcher](https://github.com/Xzonn/NitroPatcher):补丁应用工具。 diff --git a/textures/.gitignore b/textures/.gitignore index 1695cf755..e1c354547 100644 --- a/textures/.gitignore +++ b/textures/.gitignore @@ -1,2 +1,2 @@ *.png -*.psd \ No newline at end of file +*.psd diff --git a/textures/HGSS/.gitignore b/textures/HGSS/.gitignore index 12f0ffd7f..563a1b9b2 100644 --- a/textures/HGSS/.gitignore +++ b/textures/HGSS/.gitignore @@ -1,4 +1,4 @@ a/0/0/8/ a/0/3/9/ a/0/6/7/ -a/0/7/4/ \ No newline at end of file +a/0/7/4/