From 3d7108d2e39f8b229c526a46b6ff31edaefd74b5 Mon Sep 17 00:00:00 2001 From: Serhii Snitsaruk Date: Sat, 16 Nov 2024 22:09:12 +0100 Subject: [PATCH] iterating on mingw --- .../build-dotnet-assemblies/action.yml | 5 +- .github/actions/setup-mingw-ubuntu/action.yml | 34 +++++ .github/workflows/linux.yml | 1 + .github/workflows/windows.yml | 121 +++++++++++++++--- 4 files changed, 142 insertions(+), 19 deletions(-) create mode 100644 .github/actions/setup-mingw-ubuntu/action.yml diff --git a/.github/actions/build-dotnet-assemblies/action.yml b/.github/actions/build-dotnet-assemblies/action.yml index acbf053..363ba4a 100644 --- a/.github/actions/build-dotnet-assemblies/action.yml +++ b/.github/actions/build-dotnet-assemblies/action.yml @@ -8,6 +8,9 @@ inputs: - linuxbsd - windows - macos + bin: + required: true + type: string runs: using: "composite" @@ -22,7 +25,7 @@ runs: - name: Generate C# glue shell: bash 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 shell: bash diff --git a/.github/actions/setup-mingw-ubuntu/action.yml b/.github/actions/setup-mingw-ubuntu/action.yml new file mode 100644 index 0000000..c893834 --- /dev/null +++ b/.github/actions/setup-mingw-ubuntu/action.yml @@ -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" diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index a107cc0..a1d8ca1 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -248,6 +248,7 @@ jobs: uses: ./modules/limboai/.github/actions/build-dotnet-assemblies with: platform: linuxbsd + bin: ${{env.BIN}} - name: Prepare artifact env: diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 3aa95a6..c17375f 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -34,13 +34,13 @@ on: env: SCONS_CACHE_MSVC_CONFIG: true 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_CLI_TELEMETRY_OPTOUT: true jobs: windows-builds: - runs-on: "ubuntu-latest" + runs-on: "ubuntu-20.04" name: ${{ matrix.opts.name }} strategy: fail-fast: false @@ -51,18 +51,21 @@ jobs: - name: Editor (x86_64, release) target: editor arch: x86_64 + llvm: false dotnet: false should-build: true - name: Template (x86_64, release) target: template_release arch: x86_64 + llvm: false dotnet: false should-build: ${{ !inputs.test-build }} - name: Template (x86_64, debug) target: template_debug arch: x86_64 + llvm: false dotnet: false should-build: ${{ !inputs.test-build }} @@ -71,18 +74,21 @@ jobs: # - name: Editor (x86_32, release) # target: editor # arch: x86_32 + # llvm: false # dotnet: false # should-build: ${{ !inputs.test-build }} - name: Template (x86_32, release) target: template_release arch: x86_32 + llvm: false dotnet: false should-build: ${{ !inputs.test-build }} - name: Template (x86_32, debug) target: template_debug arch: x86_32 + llvm: false dotnet: false should-build: ${{ !inputs.test-build }} @@ -91,18 +97,21 @@ jobs: # - name: Editor (arm64, release) # target: editor # arch: arm64 + # llvm: true # dotnet: false # should-build: ${{ !inputs.test-build }} - name: Template (arm64, release) target: template_release arch: arm64 + llvm: true dotnet: false should-build: ${{ !inputs.test-build }} - name: Template (arm64, debug) target: template_debug arch: arm64 + llvm: true dotnet: false should-build: ${{ !inputs.test-build }} @@ -111,18 +120,21 @@ jobs: - name: Editor .NET (x86_64, release) target: editor arch: x86_64 + llvm: false dotnet: true should-build: ${{ !inputs.test-build }} - name: Template .NET (x86_64, release) target: template_release arch: x86_64 + llvm: false dotnet: true should-build: ${{ !inputs.test-build }} - name: Template .NET (x86_64, debug) target: template_debug arch: x86_64 + llvm: false dotnet: true should-build: ${{ !inputs.test-build }} @@ -131,38 +143,44 @@ jobs: # - name: Editor .NET (x86_32, release) # target: editor # arch: x86_32 + # llvm: false # dotnet: true # should-build: ${{ !inputs.test-build }} - name: Template .NET (x86_32, release) target: template_release arch: x86_32 + llvm: false dotnet: true should-build: ${{ !inputs.test-build }} - name: Template .NET (x86_32, debug) target: template_debug arch: x86_32 + llvm: false dotnet: true should-build: ${{ !inputs.test-build }} # * .NET arm64 - # - name: Editor (arm64, release) + # - name: Editor .NET (arm64, release) # target: editor # arch: arm64 + # llvm: true # dotnet: true # should-build: ${{ !inputs.test-build }} - - name: Template (arm64, release) + - name: Template .NET (arm64, release) target: template_release arch: arm64 + llvm: true dotnet: true should-build: ${{ !inputs.test-build }} - - name: Template (arm64, debug) + - name: Template .NET (arm64, debug) target: template_debug arch: arm64 + llvm: true dotnet: true should-build: ${{ !inputs.test-build }} @@ -170,7 +188,7 @@ jobs: - { opts: { should-build: false } } 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: - name: Clone Godot @@ -188,17 +206,16 @@ jobs: # Inits GODOT_VERSION, LIMBOAI_VERSION and NAME_PREFIX environment variables. - 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 uses: ./modules/limboai/.github/actions/setup-linux-toolchain with: 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 uses: actions/cache@v4 with: @@ -213,13 +230,15 @@ jobs: env: SCONS_CACHE: ${{github.workspace}}/.scons_cache/ 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 - if: matrix.opts.dotnet && matrix.opts.target == 'editor' - uses: ./modules/limboai/.github/actions/build-dotnet-assemblies - with: - platform: windows + # ! 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 @@ -247,3 +266,69 @@ jobs: with: name: ${{env.NAME_PREFIX}}${{matrix.opts.dotnet == true && '.dotnet' || ''}}.${{matrix.opts.target}}.windows.${{matrix.opts.arch}} 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/*