From 8a3adbbe68cfe1d4edc9d398e8800b12a423fec7 Mon Sep 17 00:00:00 2001 From: Leroy Hopson Date: Wed, 3 Aug 2022 22:38:21 +1200 Subject: [PATCH] Fix GitHub Actions godot-cpp-linux Docker build --- .github/workflows/main.yml | 4 +++- addons/godot_xterm/native/linux.Dockerfile | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 51bc704..414d07c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -41,7 +41,9 @@ jobs: - name: Build godot-cpp bindings if: steps.cache-submodules.outputs.cache-hit != 'true' working-directory: addons/godot_xterm/native - run: UID_GID="$(id -u):$(id -g)" docker-compose run -e TARGET=${{ matrix.target }} -e BITS=${{ matrix.bits }} godot-cpp-linux + run: | + docker-compose build godot-cpp-linux + UID_GID="$(id -u):$(id -g)" docker-compose run -e TARGET=${{ matrix.target }} -e BITS=${{ matrix.bits }} godot-cpp-linux - name: Build libuv if: steps.cache-submodules.outputs.cache-hit != 'true' working-directory: addons/godot_xterm/native diff --git a/addons/godot_xterm/native/linux.Dockerfile b/addons/godot_xterm/native/linux.Dockerfile index 4a0fd45..a957c95 100644 --- a/addons/godot_xterm/native/linux.Dockerfile +++ b/addons/godot_xterm/native/linux.Dockerfile @@ -3,5 +3,5 @@ FROM kroggen/ubuntu-16.04-gcc RUN apt-get update -y RUN apt-get install -y python3 python3-pip gcc-multilib g++-multilib -RUN pip3 install scons +RUN pip3 install scons==4.3.0 CMD scons platform=linux generate_bindings=yes target=${TARGET:-release} bits=${BITS:-64} -j$(nproc)