godot-builds

diff --git a/.github/actions/build-godot/action.yml b/.github/actions/build-godot/action.yml
index c0eb4ca..e30436e 100644
--- a/.github/actions/build-godot/action.yml
+++ b/.github/actions/build-godot/action.yml

@@ -51,8 +51,9 @@ runs:

scons_flags=${{ env.flags }}

cores=$(nproc) || cores=$(sysctl -n hw.ncpu)

[[ -n "${{ inputs.flags }}" ]] && scons_flags="${{ inputs.flags }}"

- [[ ${{ inputs.target }} == "editor" ]] && scons_flags="${scons_flags//disable_3d=yes/}" # remove disable_3d=yes if editor

- scons -j$((cores+2)) p=${{ inputs.platform }} target=${{ inputs.target }} use_lto=yes udev=yes $scons_flags

+ [[ ${{ env.tools }} == "yes" ]] && scons_flags="${scons_flags//disable_3d=yes/}" # remove disable_3d=yes if editor

+ echo "Running `scons -j$((cores+2)) p=${{ inputs.platform }} target=${{ inputs.target }} use_lto=yes udev=yes tools=${{ env.tools }} $scons_flags`"

+ scons -j$((cores+2)) p=${{ inputs.platform }} target=${{ inputs.target }} use_lto=yes udev=yes "tools=${{ env.tools }}" $scons_flags

strip bin/* || true

ls bin

echo ::endgroup::

diff --git a/.github/actions/build-upload-image/action.yml b/.github/actions/build-upload-image/action.yml
index f7eba72..ea8dd2d 100644
--- a/.github/actions/build-upload-image/action.yml
+++ b/.github/actions/build-upload-image/action.yml

@@ -28,7 +28,7 @@ runs:

with:

- - run: mv godot.linuxbsd.editor.x86_64 godot && chmod -v +x godot

+ - run: mv godot.x11.opt.tools.64 godot && chmod -v +x godot

shell: bash

- name: Login to GitHub Container Registry

diff --git a/.github/actions/release/action.yml b/.github/actions/release/action.yml
index 5bc2fa1..1283a56 100644
--- a/.github/actions/release/action.yml
+++ b/.github/actions/release/action.yml

@@ -28,7 +28,7 @@ runs:

- name: Compress

run: |

- mv godot.linuxbsd.editor.x86_64 ${{ env.fstart }}_linux.x86_64

+ mv godot.x11.opt.tools.64 ${{ env.fstart }}_linux.x86_64

mv templates.tpz ${{ env.fstart }}_export_templates.tpz

shell: bash

env:

diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml
index 0841c68..9894917 100644
--- a/.github/workflows/reusable-build.yml
+++ b/.github/workflows/reusable-build.yml

@@ -29,6 +29,7 @@ env:

ref: ${{ inputs.ref }}

flags: ${{ inputs.flags }}

modules: ${{ inputs.modules-path }}

+ tools: no

jobs:

linux:

@@ -36,7 +37,7 @@ jobs:

runs-on: ubuntu-20.04

strategy:

matrix:

- target: [template_release, template_debug]

+ target: [release, release_debug]

bits: [64]

steps:

- name: Compilation

@@ -49,12 +50,12 @@ jobs:

- name: Upload artifact

uses: bend-n/godot-builds/.github/actions/[email protected]

with:

- path: godot/bin/*.x86_64

+ path: godot/bin/*.64

windows:

strategy:

matrix:

- target: [template_release, template_debug]

+ target: [release, release_debug]

bits: [64]

runs-on: windows-latest

@@ -76,7 +77,7 @@ jobs:

runs-on: ubuntu-20.04

strategy:

matrix:

- target: [template_release, template_debug]

+ target: [release, release_debug]

steps:

- name: Set up Java 11

uses: actions/setup-java@v3

@@ -111,7 +112,7 @@ jobs:

macos:

strategy:

matrix:

- target: [template_release, template_debug]

+ target: [release, release_debug]

runs-on: macos-latest

@@ -153,21 +154,21 @@ jobs:

run: |

[[ "${{ matrix.target }}" == *"debug"* ]] && target='.debug'

cd godot

- intel=bin/godot.macos.*.x86_64

- arm=bin/godot.macos.*.arm64

- lipo -create $intel $arm -output "bin/godot.macos.opt$target.universal"

- strip "bin/godot.macos.opt$target.universal"

+ intel=bin/godot.osx.*.x86_64

+ arm=bin/godot.osx.*.arm64

+ lipo -create $intel $arm -output "bin/godot.osx.opt$target.universal"

+ strip "bin/godot.osx.opt$target.universal"

- name: Upload artifact

uses: bend-n/godot-builds/.github/actions/[email protected]

with:

path: godot/bin/*.universal

- web:

+ javascript:

strategy:

matrix:

- target: [template_release, template_debug]

- flags: [dlink_enabled=yes, ""]

+ target: [release, release_debug]

+ flags: [gdnative_enabled=yes, threads_enabled=yes, ""]

runs-on: ubuntu-20.04

@@ -185,7 +186,7 @@ jobs:

with:

target: ${{ matrix.target }}

flags: ${{ env.flags }} ${{ matrix.flags }}

- platform: web

+ platform: javascript

- name: Upload artifact

uses: bend-n/godot-builds/.github/actions/[email protected]

@@ -193,7 +194,7 @@ jobs:

path: godot/bin/*.zip

templates:

- needs: [web, macos, windows, linux, android]

+ needs: [javascript, macos, windows, linux, android]

runs-on: ubuntu-latest

env:

@@ -214,40 +215,30 @@ jobs:

- name: Prepare files

run: |

- rel="template_release"

- bug="template_debug"

- mkdir -vp "$tmps"

+ mkdir -vp ${tmps}

echo "Preparing linux"

- linux="godot.linuxbsd"

- mv "linux/$linux.$bug.x86_64" "$tmps/linux_debug.x86_64"

- mv "linux/$linux.$rel.x86_64" "$tmps/linux_release.x86_64"

+ mv linux/godot.x11.opt.64 ${tmps}/linux_x11_64_release

+ mv linux/godot.x11.opt.debug.64 ${tmps}/linux_x11_64_debug

echo "Preparing windows"

- windows="godot.windows"

- mv "windows/$windows.$bug.x86_64.console.exe" "$tmps/windows_debug_x86_64_console.exe"

- mv "windows/$windows.$bug.x86_64.exe" "$tmps/windows_debug_x86_64.exe"

- mv "windows/$windows.$rel.x86_64.console.exe" "$tmps/windows_release_x86_64_console.exe"

- mv "windows/$windows.$rel.x86_64.exe" "$tmps/windows_release_x86_64.exe"

+ mv windows/godot.windows.opt.64.exe ${tmps}/windows_64_release.exe

+ mv windows/godot.windows.opt.debug.64.exe ${tmps}/windows_64_debug.exe

echo "Preparing android"

- mv "android/android_debug.apk" "$tmps/android_debug.apk"

- mv "android/android_release.apk" "$tmps/android_release.apk"

+ mv android/android_debug.apk ${tmps}/android_debug.apk

+ mv android/android_release.apk ${tmps}/android_release.apk

echo "Preparing macos"

- mac="godot.macos.opt"

- cp -r "godot-repo/misc/dist/macos_template.app" "."

- mkdir -p "macos_template.app/Contents/MacOS"

- cp "macos/$mac.universal" "macos_template.app/Contents/MacOS/godot_macos_release.universal"

- cp "macos/$mac.debug.universal" "macos_template.app/Contents/MacOS/godot_macos_debug.universal"

- chmod +x macos_template.app/Contents/MacOS/godot_macos_*.universal

- zip -q -9 -r "$tmps/macos.zip" "macos_template.app"

+ cp -r godot-repo/misc/dist/osx_template.app .

+ mkdir -p osx_template.app/Contents/MacOS

+ cp macos/godot.osx.opt.universal osx_template.app/Contents/MacOS/godot_osx_release.64

+ cp macos/godot.osx.opt.debug.universal osx_template.app/Contents/MacOS/godot_osx_debug.64

+ chmod +x osx_template.app/Contents/MacOS/godot_osx_*.64

+ zip -q -9 -r ${tmps}/osx.zip osx_template.app

echo "Preparing web"

- web="godot.web"

- mv "web/$web.$rel.wasm32.zip" "$tmps/web_release.zip"

- mv "web/$web.$bug.wasm32.zip" "$tmps/web_debug.zip"

- mv "web/$web.$rel.wasm32.dlink.zip" "$tmps/web_dlink_release.zip"

- mv "web/$web.$bug.wasm32.dlink.zip" "$tmps/web_dlink_debug.zip"

+ mv javascript/godot.javascript.opt.zip ${tmps}/webassembly_release.zip

+ mv javascript/godot.javascript.opt.debug.zip ${tmps}/webassembly_debug.zip

+ mv javascript/godot.javascript.opt.threads.zip ${tmps}/webassembly_threads_release.zip

+ mv javascript/godot.javascript.opt.debug.threads.zip ${tmps}/webassembly_threads_debug.zip

+ mv javascript/godot.javascript.opt.gdnative.zip ${tmps}/webassembly_gdnative_release.zip

+ mv javascript/godot.javascript.opt.debug.gdnative.zip ${tmps}/webassembly_gdnative_debug.zip

- name: Prepare bundle

run: cd "${tmps}" && zip -qr9 templates.tpz ./*

@@ -265,13 +256,15 @@ jobs:

uses: bend-n/godot-builds/.github/actions/[email protected]

with:

platform: linuxbsd

- target: editor

+ target: release_debug

+ env:

+ tools: yes

- name: Upload artifact

uses: bend-n/godot-builds/.github/actions/[email protected]

with:

- path: godot/bin/*.x86_64

+ path: godot/bin/*.64

image:

permissions: write-all