godot-builds

diff --git a/.github/actions/build-upload-image/action.yml b/.github/actions/build-upload-image/action.yml
index 651f99c..14a0d44 100644
--- a/.github/actions/build-upload-image/action.yml
+++ b/.github/actions/build-upload-image/action.yml

@@ -5,6 +5,10 @@ inputs:

github-token:

required: true

description: GitHub token

+ name:

+ required: true

+ description: Name of the package

+ default: godot-2d

runs:

using: "composite"

@@ -40,7 +44,7 @@ runs:

context: .

file: Dockerfile

push: true

- tags: ghcr.io/${{ github.repository_owner }}/godot-2d:${{ env.version-name }}${{ env.tag }}

+ tags: ghcr.io/${{ github.repository_owner }}/${{ inputs.name }}:${{ env.version-name }}${{ env.tag }}

build-args: |

GODOT_VERSION=${{ env.version-name }}

RELEASE_NAME=${{ env.release }}

diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
index 23f0be9..77e2564 100644
--- a/.github/actions/setup/action.yml
+++ b/.github/actions/setup/action.yml

@@ -30,6 +30,5 @@ runs:

- name: Get module data

if: steps.clean.outputs.clean == 'true'

run: |

- modules='https://raw.githubusercontent.com/bend-n/godot-2d-builds/main/.github/custom.py'

- curl "$modules" --output godot/custom.py || wget -nv "$modules" -O godot/custom.py

+ curl "${{ env.modules }}" --output godot/custom.py || wget -nv "$modules" -O godot/custom.py

shell: bash

diff --git a/.github/normal-build-modules.py b/.github/normal-build-modules.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/.github/normal-build-modules.py

diff --git a/.github/workflows/build-3-all.yml b/.github/workflows/build-3-all.yml
index eae4474..2af6a64 100644
--- a/.github/workflows/build-3-all.yml
+++ b/.github/workflows/build-3-all.yml

@@ -2,11 +2,25 @@ name: Build godot 3.5 stable

on:

workflow_dispatch:

+ push:

+ branches:

+ - main

+ paths:

+ - .github/*.py

+ - "**.yml"

jobs:

- build3-5-stable:

- name: Build 3.5 stable

+ build3-5-stable-2d:

+ name: Build 3.5 stable (2d)

uses: bend-n/godot-2d-builds/.github/workflows/reusable-build.yml@main

with:

ref: 3.5-stable

secrets: inherit

+ build3-5-stable-normal:

+ name: Build 3.5 stable (normal)

+ uses: bend-n/godot-2d-builds/.github/workflows/reusable-build.yml@main

+ with:

+ ref: 3.5-stable

+ name: godot

+ modules-url: https://raw.githubusercontent.com/bend-n/godot-2d-builds/main/.github/normal-build-modules.py

+ secrets: inherit

diff --git a/.github/workflows/build-3.x.yml b/.github/workflows/build-3.x.yml
index 44d6885..6704a17 100644
--- a/.github/workflows/build-3.x.yml
+++ b/.github/workflows/build-3.x.yml

@@ -4,11 +4,25 @@ on:

workflow_dispatch:

schedule:

- cron: "0 0 * * *"

+ push:

+ branches:

+ - main

+ paths:

+ - .github/*.py

+ - "**.yml"

jobs:

build-3x:

- name: Build 3.x

+ name: Build 3.x (2d)

uses: bend-n/godot-2d-builds/.github/workflows/reusable-build.yml@main

with:

ref: 3.x

secrets: inherit

+ build-3x-normal:

+ name: Build 3.x (normal)

+ uses: bend-n/godot-2d-builds/.github/workflows/reusable-build.yml@main

+ with:

+ ref: 3.x

+ name: godot

+ modules-url: https://raw.githubusercontent.com/bend-n/godot-2d-builds/main/.github/normal-build-modules.py

+ secrets: inherit

diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml
index 318c3ef..597abad 100644
--- a/.github/workflows/reusable-build.yml
+++ b/.github/workflows/reusable-build.yml

@@ -10,10 +10,19 @@ on:

type: string

default: disable_3d=yes

required: false

+ modules-url:

+ type: string

+ default: "https://raw.githubusercontent.com/bend-n/godot-2d-builds/main/.github/2d-build-modules.py"

+ required: false

+ name:

+ type: string

+ default: godot-2d

+ required: false

env:

ref: ${{ inputs.ref }}

flags: ${{ inputs.flags }}

+ modules: ${{ inputs.modules-url }}

tools: no

jobs:

@@ -235,3 +244,4 @@ jobs:

- uses: bend-n/godot-2d-builds/.github/actions/build-upload-image@main

with:

github-token: ${{ secrets.GITHUB_TOKEN }}

+ name: ${{ inputs.name }}