builds godot
retire 3.x
| -rw-r--r-- | .github/actions/setup/action.yml | 6 | ||||
| -rw-r--r-- | .github/workflows/build-3.x-2d.yml | 21 | ||||
| -rw-r--r-- | .github/workflows/build-3.x-normal.yml | 24 | ||||
| -rwxr-xr-x | README.md | 3 |
4 files changed, 6 insertions, 48 deletions
diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index db4821f..51060c6 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -45,6 +45,10 @@ runs: echo "::group::Patch godot" (cd repo && mv "${{ env.modules }}" ../godot/custom.py && mv patches ../godot) cd godot - for patch in patches/*; do git apply --ignore-whitespace "$patch" || echo "::error file={${patch}}::Go update your patch"; done + for patch in patches/*; do git apply --ignore-whitespace "$patch" || err="$patch"; done + if [[ -z $err ]]; then + echo "::error file={${err}}::Go update your patch" + exit 1 + fi echo "::endgroup::" shell: bash diff --git a/.github/workflows/build-3.x-2d.yml b/.github/workflows/build-3.x-2d.yml deleted file mode 100644 index 3ecb2b9..0000000 --- a/.github/workflows/build-3.x-2d.yml +++ /dev/null @@ -1,21 +0,0 @@ -name: Build godot on branch 3.x (2d) - -on: - workflow_dispatch: - schedule: - - cron: "0 0 * * *" - push: - branches: - - main - paths: - - .github/2d*.py - - .github/workflows/build-3.x-2d.yml - - Dockerfile - -jobs: - build: - name: Build - uses: bend-n/godot-builds/.github/workflows/reusable-build.yml@main - with: - ref: 3.x - secrets: inherit diff --git a/.github/workflows/build-3.x-normal.yml b/.github/workflows/build-3.x-normal.yml deleted file mode 100644 index e235f52..0000000 --- a/.github/workflows/build-3.x-normal.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: Build godot on branch 3.x (normal) - -on: - workflow_dispatch: - schedule: - - cron: "0 0 * * *" - push: - branches: - - main - paths: - - .github/normal*.py - - .github/workflows/build-3.x-normal.yml - - Dockerfile - -jobs: - build: - name: Build - uses: bend-n/godot-builds/.github/workflows/reusable-build.yml@main - with: - ref: 3.x - name: godot - build-name: normal - modules-path: ./.github/normal-build-modules.py - secrets: inherit @@ -1,6 +1,6 @@ # godot builds -[](https://godotengine.org) +[](https://godotengine.org) [](https://aur.archlinux.org/packages/godot2d "Aur package") <a href='https://ko-fi.com/bendn' title='Buy me a coffee' target='_blank'><img height='28' src='https://ko-fi.com/img/githubbutton_sm.svg' alt='Buy me a coffee'> </a> @@ -37,7 +37,6 @@ build-windows: <summary>Manually</summary> > **Warning** -> > This method has _not_ been tested. ```yaml |