builds godot
better versioning
| -rw-r--r-- | .github/workflows/build-3.5-normal.yml | 1 | ||||
| -rw-r--r-- | .github/workflows/build-3.x-normal.yml | 1 | ||||
| -rw-r--r-- | .github/workflows/reusable-build.yml | 5 | ||||
| -rw-r--r-- | patches/no-arg-handling.patch | 11 |
4 files changed, 17 insertions, 1 deletions
diff --git a/.github/workflows/build-3.5-normal.yml b/.github/workflows/build-3.5-normal.yml index b54c493..96d0f93 100644 --- a/.github/workflows/build-3.5-normal.yml +++ b/.github/workflows/build-3.5-normal.yml @@ -16,5 +16,6 @@ jobs: with: ref: 3.5-stable name: godot + build-name: normal modules-path: ./.github/normal-build-modules.py secrets: inherit diff --git a/.github/workflows/build-3.x-normal.yml b/.github/workflows/build-3.x-normal.yml index 4a9e8c5..5a722e9 100644 --- a/.github/workflows/build-3.x-normal.yml +++ b/.github/workflows/build-3.x-normal.yml @@ -18,5 +18,6 @@ jobs: with: ref: 3.x 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 679d1a0..93773ad 100644 --- a/.github/workflows/reusable-build.yml +++ b/.github/workflows/reusable-build.yml @@ -18,8 +18,13 @@ on: type: string default: godot-2d required: false + build-name: + type: string + default: 2d + required: false env: + BUILD_NAME: ${{ inputs.build-name }} ref: ${{ inputs.ref }} flags: ${{ inputs.flags }} modules: ${{ inputs.modules-path }} diff --git a/patches/no-arg-handling.patch b/patches/no-arg-handling.patch index f82a21e..783b043 100644 --- a/patches/no-arg-handling.patch +++ b/patches/no-arg-handling.patch @@ -1,5 +1,5 @@ diff --git a/main/main.cpp b/main/main.cpp -index 37ef433..c5b8363 100644 +index 37ef4332..f4baf553 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -128,7 +128,9 @@ static int audio_driver_idx = -1; @@ -138,3 +138,12 @@ index 37ef433..c5b8363 100644 if (performance) { memdelete(performance); +@@ -1338,7 +1333,7 @@ error: + + Error Main::setup2(Thread::ID p_main_tid_override) { + // Print engine name and version +- print_line(String(VERSION_NAME) + " v" + get_full_version_string() + " - " + String(VERSION_WEBSITE)); ++ print_line("v" + get_full_version_string()); + + #if !defined(NO_THREADS) + if (p_main_tid_override) { |