iterating on mingw

This commit is contained in:
Serhii Snitsaruk 2024-11-16 22:09:12 +01:00
parent 1ba5a405e7
commit 3d7108d2e3
No known key found for this signature in database
GPG Key ID: A965EF8799FFEC2D
4 changed files with 142 additions and 19 deletions

View File

@ -8,6 +8,9 @@ inputs:
- linuxbsd - linuxbsd
- windows - windows
- macos - macos
bin:
required: true
type: string
runs: runs:
using: "composite" using: "composite"
@ -22,7 +25,7 @@ runs:
- name: Generate C# glue - name: Generate C# glue
shell: bash shell: bash
run: | run: |
./bin/${BIN} --headless --generate-mono-glue ./modules/mono/glue || true ./bin/${{inputs.bin}} --headless --generate-mono-glue ./modules/mono/glue || true
- name: Build .NET assemblies - name: Build .NET assemblies
shell: bash shell: bash

View File

@ -0,0 +1,34 @@
name: Setup MinGW on Ubuntu
inputs:
arch:
required: true
runs:
using: "composite"
steps:
- name: Set up MinGW for x86_64
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
- 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
- name: Set up LLVM MinGW for arm64
if: inputs.arch == 'arm64'
shell: bash
run: |
curl -LO https://github.com/mstorsjo/llvm-mingw/releases/download/20240619/llvm-mingw-20240619-ucrt-ubuntu-20.04-x86_64.tar.xz
tar xf llvm-mingw-20240619-ucrt-ubuntu-20.04-x86_64.tar.xz
rm -f llvm-mingw-20240619-ucrt-ubuntu-20.04-x86_64.tar.xz
mv -f llvm-mingw-20240619-ucrt-ubuntu-20.04-x86_64 llvm-mingw
echo "MINGW_PREFIX=${GITHUB_WORKSPACE}/llvm-mingw" >> "$GITHUB_ENV"

View File

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

View File

@ -34,13 +34,13 @@ on:
env: env:
SCONS_CACHE_MSVC_CONFIG: true SCONS_CACHE_MSVC_CONFIG: true
SCONS_CACHE_LIMIT: 4096 SCONS_CACHE_LIMIT: 4096
SCONSFLAGS: production=yes use_mingw=yes d3d12=yes tests=no verbose=yes warnings=extra werror=yes SCONSFLAGS: production=yes use_mingw=yes verbose=yes warnings=no progress=no
DOTNET_NOLOGO: true DOTNET_NOLOGO: true
DOTNET_CLI_TELEMETRY_OPTOUT: true DOTNET_CLI_TELEMETRY_OPTOUT: true
jobs: jobs:
windows-builds: windows-builds:
runs-on: "ubuntu-latest" runs-on: "ubuntu-20.04"
name: ${{ matrix.opts.name }} name: ${{ matrix.opts.name }}
strategy: strategy:
fail-fast: false fail-fast: false
@ -51,18 +51,21 @@ jobs:
- name: Editor (x86_64, release) - name: Editor (x86_64, release)
target: editor target: editor
arch: x86_64 arch: x86_64
llvm: false
dotnet: false dotnet: false
should-build: true should-build: true
- name: Template (x86_64, release) - name: Template (x86_64, release)
target: template_release target: template_release
arch: x86_64 arch: x86_64
llvm: false
dotnet: false dotnet: false
should-build: ${{ !inputs.test-build }} should-build: ${{ !inputs.test-build }}
- name: Template (x86_64, debug) - name: Template (x86_64, debug)
target: template_debug target: template_debug
arch: x86_64 arch: x86_64
llvm: false
dotnet: false dotnet: false
should-build: ${{ !inputs.test-build }} should-build: ${{ !inputs.test-build }}
@ -71,18 +74,21 @@ jobs:
# - name: Editor (x86_32, release) # - name: Editor (x86_32, release)
# target: editor # target: editor
# arch: x86_32 # arch: x86_32
# llvm: false
# dotnet: false # dotnet: false
# should-build: ${{ !inputs.test-build }} # should-build: ${{ !inputs.test-build }}
- name: Template (x86_32, release) - name: Template (x86_32, release)
target: template_release target: template_release
arch: x86_32 arch: x86_32
llvm: false
dotnet: false dotnet: false
should-build: ${{ !inputs.test-build }} should-build: ${{ !inputs.test-build }}
- name: Template (x86_32, debug) - name: Template (x86_32, debug)
target: template_debug target: template_debug
arch: x86_32 arch: x86_32
llvm: false
dotnet: false dotnet: false
should-build: ${{ !inputs.test-build }} should-build: ${{ !inputs.test-build }}
@ -91,18 +97,21 @@ jobs:
# - name: Editor (arm64, release) # - name: Editor (arm64, release)
# target: editor # target: editor
# arch: arm64 # arch: arm64
# llvm: true
# dotnet: false # dotnet: false
# should-build: ${{ !inputs.test-build }} # should-build: ${{ !inputs.test-build }}
- name: Template (arm64, release) - name: Template (arm64, release)
target: template_release target: template_release
arch: arm64 arch: arm64
llvm: true
dotnet: false dotnet: false
should-build: ${{ !inputs.test-build }} should-build: ${{ !inputs.test-build }}
- name: Template (arm64, debug) - name: Template (arm64, debug)
target: template_debug target: template_debug
arch: arm64 arch: arm64
llvm: true
dotnet: false dotnet: false
should-build: ${{ !inputs.test-build }} should-build: ${{ !inputs.test-build }}
@ -111,18 +120,21 @@ jobs:
- name: Editor .NET (x86_64, release) - name: Editor .NET (x86_64, release)
target: editor target: editor
arch: x86_64 arch: x86_64
llvm: false
dotnet: true dotnet: true
should-build: ${{ !inputs.test-build }} should-build: ${{ !inputs.test-build }}
- name: Template .NET (x86_64, release) - name: Template .NET (x86_64, release)
target: template_release target: template_release
arch: x86_64 arch: x86_64
llvm: false
dotnet: true dotnet: true
should-build: ${{ !inputs.test-build }} should-build: ${{ !inputs.test-build }}
- name: Template .NET (x86_64, debug) - name: Template .NET (x86_64, debug)
target: template_debug target: template_debug
arch: x86_64 arch: x86_64
llvm: false
dotnet: true dotnet: true
should-build: ${{ !inputs.test-build }} should-build: ${{ !inputs.test-build }}
@ -131,38 +143,44 @@ jobs:
# - name: Editor .NET (x86_32, release) # - name: Editor .NET (x86_32, release)
# target: editor # target: editor
# arch: x86_32 # arch: x86_32
# llvm: false
# dotnet: true # dotnet: true
# should-build: ${{ !inputs.test-build }} # should-build: ${{ !inputs.test-build }}
- name: Template .NET (x86_32, release) - name: Template .NET (x86_32, release)
target: template_release target: template_release
arch: x86_32 arch: x86_32
llvm: false
dotnet: true dotnet: true
should-build: ${{ !inputs.test-build }} should-build: ${{ !inputs.test-build }}
- name: Template .NET (x86_32, debug) - name: Template .NET (x86_32, debug)
target: template_debug target: template_debug
arch: x86_32 arch: x86_32
llvm: false
dotnet: true dotnet: true
should-build: ${{ !inputs.test-build }} should-build: ${{ !inputs.test-build }}
# * .NET arm64 # * .NET arm64
# - name: Editor (arm64, release) # - name: Editor .NET (arm64, release)
# target: editor # target: editor
# arch: arm64 # arch: arm64
# llvm: true
# dotnet: true # dotnet: true
# should-build: ${{ !inputs.test-build }} # should-build: ${{ !inputs.test-build }}
- name: Template (arm64, release) - name: Template .NET (arm64, release)
target: template_release target: template_release
arch: arm64 arch: arm64
llvm: true
dotnet: true dotnet: true
should-build: ${{ !inputs.test-build }} should-build: ${{ !inputs.test-build }}
- name: Template (arm64, debug) - name: Template .NET (arm64, debug)
target: template_debug target: template_debug
arch: arm64 arch: arm64
llvm: true
dotnet: true dotnet: true
should-build: ${{ !inputs.test-build }} should-build: ${{ !inputs.test-build }}
@ -170,7 +188,7 @@ jobs:
- { opts: { should-build: false } } - { opts: { should-build: false } }
env: env:
BIN: godot.windows.${{matrix.opts.target}}.${{matrix.opts.arch}}${{ matrix.opts.dotnet == true && '.mono' || '' }} BIN: godot.windows.${{matrix.opts.target}}.${{matrix.opts.arch}}${{matrix.opts.llvm && '.llvm' || ''}}${{matrix.opts.dotnet == true && '.mono' || ''}}
steps: steps:
- name: Clone Godot - name: Clone Godot
@ -188,17 +206,16 @@ jobs:
# Inits GODOT_VERSION, LIMBOAI_VERSION and NAME_PREFIX environment variables. # Inits GODOT_VERSION, LIMBOAI_VERSION and NAME_PREFIX environment variables.
- uses: ./modules/limboai/.github/actions/init-version - uses: ./modules/limboai/.github/actions/init-version
- name: Set up Python 3.x
uses: actions/setup-python@v5
with:
python-version: "3.x"
architecture: "x64"
- name: Set up Linux toolchain - name: Set up Linux toolchain
uses: ./modules/limboai/.github/actions/setup-linux-toolchain uses: ./modules/limboai/.github/actions/setup-linux-toolchain
with: with:
arch: ${{matrix.opts.arch}} arch: ${{matrix.opts.arch}}
- name: Set up MinGW
uses: ./modules/limboai/.github/actions/setup-mingw-ubuntu
with:
arch: ${{matrix.opts.arch}}
- name: Set up scons cache - name: Set up scons cache
uses: actions/cache@v4 uses: actions/cache@v4
with: with:
@ -213,13 +230,15 @@ jobs:
env: env:
SCONS_CACHE: ${{github.workspace}}/.scons_cache/ SCONS_CACHE: ${{github.workspace}}/.scons_cache/
run: | run: |
scons -j2 platform=windows target=${{matrix.opts.target}} arch=${{matrix.opts.arch}} module_mono_enabled=${{matrix.opts.dotnet}} ${{env.SCONSFLAGS}} 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}}
- name: Build .NET assemblies # ! TODO: Need a separate assembly job.
if: matrix.opts.dotnet && matrix.opts.target == 'editor' # - name: Build .NET assemblies
uses: ./modules/limboai/.github/actions/build-dotnet-assemblies # if: matrix.opts.dotnet && matrix.opts.target == 'editor'
with: # uses: ./modules/limboai/.github/actions/build-dotnet-assemblies
platform: windows # with:
# platform: windows
- name: Prepare artifact - name: Prepare artifact
shell: bash shell: bash
@ -247,3 +266,69 @@ jobs:
with: with:
name: ${{env.NAME_PREFIX}}${{matrix.opts.dotnet == true && '.dotnet' || ''}}.${{matrix.opts.target}}.windows.${{matrix.opts.arch}} name: ${{env.NAME_PREFIX}}${{matrix.opts.dotnet == true && '.dotnet' || ''}}.${{matrix.opts.target}}.windows.${{matrix.opts.arch}}
path: out/* path: out/*
dotnet-assemblies:
runs-on: "windows-latest"
name: Build .NET assemblies
needs: windows-builds
strategy:
fail-fast: false
matrix:
opts:
- name: Editor .NET (x86_64, release)
target: editor
arch: x86_64
llvm: false
dotnet: true
should-build: ${{ !inputs.test-build }}
exclude:
- { opts: { should-build: false } }
env:
BIN: godot.windows.${{matrix.opts.target}}.${{matrix.opts.arch}}${{matrix.opts.llvm && '.llvm' || ''}}${{matrix.opts.dotnet == true && '.mono' || ''}}
steps:
- name: Clone Godot
uses: actions/checkout@v4
with:
repository: godotengine/godot
ref: ${{ inputs.godot-ref }}
- name: Clone LimboAI module
uses: actions/checkout@v4
with:
path: modules/limboai
ref: ${{ inputs.limboai-ref }}
# Inits GODOT_VERSION, LIMBOAI_VERSION and NAME_PREFIX environment variables.
- uses: ./modules/limboai/.github/actions/init-version
- name: Reconstruct artifact name
shell: bash
run: |
echo "ARTIFACT=${{env.NAME_PREFIX}}.dotnet.editor.windows.${{matrix.opts.arch}}" >> $GITHUB_ENV
- name: Download editor artifact
uses: actions/download-artifact@v4
with:
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:
platform: windows
bin: ${{env.BIN}}
- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: ${{env.ARTIFACT}}
overwrite: true
path: bin/*