Compare commits

..

2 Commits

Author SHA1 Message Date
Serhii Snitsaruk 63fc4b12d5
ubuntu2404 2024-11-18 02:47:57 +01:00
Serhii Snitsaruk 8b0caa0427
GHA: Use MinGW on Ubuntu runner for Windows builds 2024-11-18 01:49:58 +01:00
3 changed files with 12 additions and 23 deletions

View File

@ -11,17 +11,17 @@ runs:
if: inputs.arch == 'x86_64'
shell: bash
run: |
sudo apt-get install gcc-mingw-w64 g++-mingw-w64-x86-64
sudo update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-posix
sudo update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix
sudo apt-get install g++-mingw-w64-x86-64-posix
# sudo update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-posix
# sudo update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix
- name: Set up MinGW for x86_32
if: inputs.arch == 'x86_32'
shell: bash
run: |
sudo apt-get install gcc-mingw-w64 g++-mingw-w64-i686
sudo update-alternatives --set i686-w64-mingw32-gcc /usr/bin/i686-w64-mingw32-gcc-posix
sudo update-alternatives --set i686-w64-mingw32-g++ /usr/bin/i686-w64-mingw32-g++-posix
sudo apt-get install g++-mingw-w64-i686-posix
# sudo update-alternatives --set i686-w64-mingw32-gcc /usr/bin/i686-w64-mingw32-gcc-posix
# sudo update-alternatives --set i686-w64-mingw32-g++ /usr/bin/i686-w64-mingw32-g++-posix
- name: Set up LLVM MinGW for arm64
if: inputs.arch == 'arm64'

View File

@ -195,6 +195,7 @@ jobs:
uses: ./modules/limboai/.github/actions/build-dotnet-assemblies
with:
platform: macos
bin: ${{env.BIN}}
- name: Prepare artifact
run: |

View File

@ -40,7 +40,7 @@ env:
jobs:
windows-builds:
runs-on: "ubuntu-20.04"
runs-on: "ubuntu-24.04"
name: ${{ matrix.opts.name }}
strategy:
fail-fast: false
@ -221,10 +221,10 @@ jobs:
with:
path: ${{github.workspace}}/.scons_cache/
key: ${{env.BIN}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}-${{env.LIMBOAI_VERSION}}
restore-keys: |
${{env.BIN}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}-${{env.LIMBOAI_VERSION}}
${{env.BIN}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}
${{env.BIN}}-${{inputs.godot-ref}}
# restore-keys: |
# ${{env.BIN}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}-${{env.LIMBOAI_VERSION}}
# ${{env.BIN}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}
# ${{env.BIN}}-${{inputs.godot-ref}}
- name: Compilation
env:
@ -233,13 +233,6 @@ jobs:
PATH=${GITHUB_WORKSPACE}/buildroot/bin:$PATH
scons platform=windows target=${{matrix.opts.target}} arch=${{matrix.opts.arch}} use_llvm=${{matrix.opts.llvm}} module_mono_enabled=${{matrix.opts.dotnet}} ${{env.SCONSFLAGS}}
# ! TODO: Need a separate assembly job.
# - name: Build .NET assemblies
# if: matrix.opts.dotnet && matrix.opts.target == 'editor'
# uses: ./modules/limboai/.github/actions/build-dotnet-assemblies
# with:
# platform: windows
- name: Prepare artifact
shell: bash
env:
@ -315,11 +308,6 @@ jobs:
name: ${{env.ARTIFACT}}
path: bin/
- name: Print directory structure
shell: bash
run: |
ls -R bin
- name: Build .NET assemblies
uses: ./modules/limboai/.github/actions/build-dotnet-assemblies
with: