Fix GitHub Actions godot-cpp-linux Docker build

This commit is contained in:
Leroy Hopson 2022-08-03 22:38:21 +12:00
parent 03583c0a1b
commit 8a3adbbe68
No known key found for this signature in database
GPG key ID: D2747312A6DB51AA
2 changed files with 4 additions and 2 deletions

View file

@ -41,7 +41,9 @@ jobs:
- name: Build godot-cpp bindings - name: Build godot-cpp bindings
if: steps.cache-submodules.outputs.cache-hit != 'true' if: steps.cache-submodules.outputs.cache-hit != 'true'
working-directory: addons/godot_xterm/native 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 - name: Build libuv
if: steps.cache-submodules.outputs.cache-hit != 'true' if: steps.cache-submodules.outputs.cache-hit != 'true'
working-directory: addons/godot_xterm/native working-directory: addons/godot_xterm/native

View file

@ -3,5 +3,5 @@
FROM kroggen/ubuntu-16.04-gcc FROM kroggen/ubuntu-16.04-gcc
RUN apt-get update -y RUN apt-get update -y
RUN apt-get install -y python3 python3-pip gcc-multilib g++-multilib 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) CMD scons platform=linux generate_bindings=yes target=${TARGET:-release} bits=${BITS:-64} -j$(nproc)