Compare commits

..

2 Commits

Author SHA1 Message Date
Serhii Snitsaruk 3d7108d2e3
iterating on mingw 2024-11-18 00:35:46 +01:00
Serhii Snitsaruk 1ba5a405e7
GHA: Use mingw & d3d12 for Windows builds 2024-11-16 22:02:55 +01:00
3 changed files with 23 additions and 12 deletions

View File

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

View File

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

View File

@ -40,7 +40,7 @@ env:
jobs: jobs:
windows-builds: windows-builds:
runs-on: "ubuntu-24.04" runs-on: "ubuntu-20.04"
name: ${{ matrix.opts.name }} name: ${{ matrix.opts.name }}
strategy: strategy:
fail-fast: false fail-fast: false
@ -221,10 +221,10 @@ jobs:
with: with:
path: ${{github.workspace}}/.scons_cache/ path: ${{github.workspace}}/.scons_cache/
key: ${{env.BIN}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}-${{env.LIMBOAI_VERSION}} key: ${{env.BIN}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}-${{env.LIMBOAI_VERSION}}
# restore-keys: | restore-keys: |
# ${{env.BIN}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}-${{env.LIMBOAI_VERSION}} ${{env.BIN}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}-${{env.LIMBOAI_VERSION}}
# ${{env.BIN}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}} ${{env.BIN}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}
# ${{env.BIN}}-${{inputs.godot-ref}} ${{env.BIN}}-${{inputs.godot-ref}}
- name: Compilation - name: Compilation
env: env:
@ -233,6 +233,13 @@ jobs:
PATH=${GITHUB_WORKSPACE}/buildroot/bin:$PATH 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}} 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 - name: Prepare artifact
shell: bash shell: bash
env: env:
@ -308,6 +315,11 @@ jobs:
name: ${{env.ARTIFACT}} name: ${{env.ARTIFACT}}
path: bin/ path: bin/
- name: Print directory structure
shell: bash
run: |
ls -R bin
- name: Build .NET assemblies - name: Build .NET assemblies
uses: ./modules/limboai/.github/actions/build-dotnet-assemblies uses: ./modules/limboai/.github/actions/build-dotnet-assemblies
with: with: