builds godot
add 3.5.x builds
| -rw-r--r-- | .github/actions/setup/action.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/build-3.5.stable-2d.yml (renamed from .github/workflows/build-3.5-2d.yml) | 2 | ||||
| -rw-r--r-- | .github/workflows/build-3.5.stable-normal.yml (renamed from .github/workflows/build-3.5-normal.yml) | 2 | ||||
| -rw-r--r-- | .github/workflows/build-3.5.x-2d.yml | 21 | ||||
| -rw-r--r-- | .github/workflows/build-3.5.x-normal.yml | 24 | ||||
| -rw-r--r-- | .github/workflows/reusable-build.yml | 7 |
6 files changed, 54 insertions, 4 deletions
diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 51060c6..c88d541 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -46,7 +46,7 @@ runs: (cd repo && mv "${{ env.modules }}" ../godot/custom.py && mv patches ../godot) cd godot for patch in patches/*; do git apply --ignore-whitespace "$patch" || err="$patch"; done - if [[ -z $err ]]; then + if [[ -n $err ]]; then echo "::error file={${err}}::Go update your patch" exit 1 fi diff --git a/.github/workflows/build-3.5-2d.yml b/.github/workflows/build-3.5.stable-2d.yml index dce2d96..5c8fa48 100644 --- a/.github/workflows/build-3.5-2d.yml +++ b/.github/workflows/build-3.5.stable-2d.yml @@ -1,4 +1,4 @@ -name: Build godot 3.5 stable (2d) +name: Build godot 3.5.stable (2d) on: workflow_dispatch: diff --git a/.github/workflows/build-3.5-normal.yml b/.github/workflows/build-3.5.stable-normal.yml index f77bdff..160d7c7 100644 --- a/.github/workflows/build-3.5-normal.yml +++ b/.github/workflows/build-3.5.stable-normal.yml @@ -1,4 +1,4 @@ -name: Build godot 3.5 stable (normal) +name: Build godot 3.5.stable (normal) on: workflow_dispatch: diff --git a/.github/workflows/build-3.5.x-2d.yml b/.github/workflows/build-3.5.x-2d.yml new file mode 100644 index 0000000..a5c35b9 --- /dev/null +++ b/.github/workflows/build-3.5.x-2d.yml @@ -0,0 +1,21 @@ +name: Build godot 3.5.x stable (2d) + +on: + workflow_dispatch: + schedule: + - cron: "0 0 * * *" + push: + branches: + - main + paths: + - .github/2d*.py + - .github/workflows/build-3.5-2d.yml + - Dockerfile + +jobs: + build: + name: Build + uses: bend-n/godot-builds/.github/workflows/reusable-build.yml@main + with: + ref: 3.5 + secrets: inherit diff --git a/.github/workflows/build-3.5.x-normal.yml b/.github/workflows/build-3.5.x-normal.yml new file mode 100644 index 0000000..643c908 --- /dev/null +++ b/.github/workflows/build-3.5.x-normal.yml @@ -0,0 +1,24 @@ +name: Build godot 3.5.x (normal) + +on: + workflow_dispatch: + schedule: + - cron: "0 0 * * *" + push: + branches: + - main + paths: + - .github/normal*.py + - .github/workflows/build-3.5-normal.yml + - Dockerfile + +jobs: + build: + name: Build + uses: bend-n/godot-builds/.github/workflows/reusable-build.yml@main + with: + ref: 3.5 + name: godot + build-name: normal + modules-path: ./.github/normal-build-modules.py + secrets: inherit diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml index d66bb51..76377c6 100644 --- a/.github/workflows/reusable-build.yml +++ b/.github/workflows/reusable-build.yml @@ -23,6 +23,10 @@ on: default: 2d required: false +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + env: BUILD_NAME: ${{ inputs.build-name }} ref: ${{ inputs.ref }} @@ -230,7 +234,7 @@ jobs: platform: [server, x11] name: Build linux tools - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - name: Build editor uses: bend-n/godot-builds/.github/actions/build-godot@main @@ -248,6 +252,7 @@ jobs: path: godot/bin/*.64 build-image: + permissions: write-all name: Build docker image runs-on: ubuntu-latest needs: [tools, templates] |