godot-builds

diff --git a/.github/actions/build-godot/action.yml b/.github/actions/build-godot/action.yml
index 8c84607..0224fb7 100644
--- a/.github/actions/build-godot/action.yml
+++ b/.github/actions/build-godot/action.yml

@@ -25,9 +25,9 @@ runs:

ref: ${{ env.ref }}

- name: Install linux dependencies

- if: ${{ inputs.platform }} == "x11"

+ if: inputs.platform == 'x11'

run: |

- [[ ${{ inputs.platform }} != "x11" ]] && exit 0

+ echo ::group::Dependencies

sudo apt-get update -q

sudo apt-get install -qqq \

build-essential pkg-config libx11-dev libxcursor-dev \

@@ -35,6 +35,7 @@ runs:

libpulse-dev libudev-dev libxi-dev libxrandr-dev yasm \

libspeechd-dev speech-dispatcher \

tree

+ echo ::endgroup::

shell: bash

- name: Setup scons

@@ -43,11 +44,14 @@ runs:

- name: Build Godot

run: |

+ echo ::group::Compilation

cd godot

- scons_flags=$flags

+ scons_flags=${{ env.flags }}

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

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

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

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

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

strip bin/* || true

ls bin

+ echo ::endgroup::

shell: bash

diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
index c88d541..d86b067 100644
--- a/.github/actions/setup/action.yml
+++ b/.github/actions/setup/action.yml

@@ -42,7 +42,6 @@ runs:

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

run: |

# Patch godot

- 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" || err="$patch"; done

@@ -50,5 +49,4 @@ runs:

echo "::error file={${err}}::Go update your patch"

exit 1

- echo "::endgroup::"

shell: bash

diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml
index 8ab87ab..97afc25 100644
--- a/.github/workflows/reusable-build.yml
+++ b/.github/workflows/reusable-build.yml

@@ -229,17 +229,16 @@ jobs:

matrix:

platform: [server, x11]

- name: Build linux tools

+ name: Linux tools

runs-on: ubuntu-20.04

steps:

- - name: Build editor

+ - name: Compilation

uses: bend-n/godot-builds/.github/actions/build-godot@main

with:

platform: ${{ matrix.platform }}

target: release_debug

env:

tools: yes

- flags: "" # override flags

- name: Upload artifact

uses: bend-n/godot-builds/.github/actions/upload-artifact@main

@@ -247,9 +246,9 @@ jobs:

name: ${{ matrix.platform }}-tools-release

path: godot/bin/*.64

- build-image:

+ image:

permissions: write-all

- name: Build docker image

+ name: Docker image

runs-on: ubuntu-latest

needs: [tools, templates]

steps: