From 17ff9fdb983ecbba78d3a1666d492b13e70c2404 Mon Sep 17 00:00:00 2001 From: Vano Date: Mon, 11 Mar 2024 20:27:41 +0200 Subject: [PATCH 1/5] cmake ci --- .github/workflows/ci.yml | 240 ++++++++++++++++++++------------------- 1 file changed, 126 insertions(+), 114 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 89258520d..d1d9dc850 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,78 +11,153 @@ concurrency: jobs: build: - name: ${{ matrix.name }} - runs-on: ${{ matrix.os }} + name: "${{ matrix.platforms.name }} (${{ matrix.builder.name }}, ${{matrix.platforms.description}})" + runs-on: ${{ matrix.platforms.os }} strategy: fail-fast: false matrix: - include: - - name: 🐧 Linux (GCC) + builder: + - name: SCons + generate_sources: | + scons {0} build_library=no verbose=yes + scons -c + + build_godot_cpp_debug: | + scons {0} target=template_debug verbose=yes + + build_debug: | + cd test + scons {0} target=template_debug build_library=no verbose=yes + + build_release: | + cd test + scons {0} target=template_release verbose=yes + + - name: CMake + generate_sources: | + cmake {0} -DCMAKE_BUILD_TYPE=Debug -B build test + + build_godot_cpp_debug: | + cmake --build build --config Debug --target godot-cpp + + build_debug: | + cmake --build build --config Debug + + build_release: | + cmake {0} -DCMAKE_BUILD_TYPE=Release -DTARGET=TEMPLATE_RELEASE -B build_release test + cmake --build build_release --config Release + + platforms: + - name: 🐧 Linux + description: 'GCC' os: ubuntu-20.04 platform: linux artifact-name: godot-cpp-linux-glibc2.27-x86_64-release - artifact-path: bin/libgodot-cpp.linux.template_release.x86_64.a + artifact-path: + SCons: bin/libgodot-cpp.linux.template_release.x86_64.a + CMake: build_release/godot-cpp/bin/libgodot-cpp.linux.template_release.x86_64.a + flags: + SCons: platform=linux + CMake: -G Ninja run-tests: true cache-name: linux-x86_64 - - name: 🐧 Linux (GCC, Double Precision) + - name: 🐧 Linux + description: 'GCC, Double Precision' os: ubuntu-20.04 platform: linux artifact-name: godot-cpp-linux-glibc2.27-x86_64-double-release - artifact-path: bin/libgodot-cpp.linux.template_release.double.x86_64.a - flags: precision=double + artifact-path: + SCons: bin/libgodot-cpp.linux.template_release.double.x86_64.a + CMake: build_release/godot-cpp/bin/libgodot-cpp.linux.template_release.double.x86_64.a + flags: + SCons: platform=linux precision=double + CMake: -G Ninja -DFLOAT_PRECISION=DOUBLE run-tests: false cache-name: linux-x86_64-f64 - - name: 🏁 Windows (x86_64, MSVC) + - name: 🏁 Windows + description: 'x86_64, MSVC' os: windows-2019 platform: windows artifact-name: godot-cpp-windows-msvc2019-x86_64-release - artifact-path: bin/libgodot-cpp.windows.template_release.x86_64.lib + artifact-path: + SCons: bin/libgodot-cpp.windows.template_release.x86_64.lib + CMake: build_release/Release/gdexample.windows.template_release.x86_64.lib + flags: + Scons: platform=windows + CMake: '-G "Visual Studio 16 2019" -A x64' run-tests: false cache-name: windows-x86_64-msvc - - name: 🏁 Windows (x86_64, MinGW) + - name: 🏁 Windows + description: 'x86_64, MinGW' os: windows-2019 platform: windows artifact-name: godot-cpp-linux-mingw-x86_64-release - artifact-path: bin/libgodot-cpp.windows.template_release.x86_64.a - flags: use_mingw=yes + artifact-path: + SCons: bin/libgodot-cpp.windows.template_release.x86_64.a + CMake: build_release/godot-cpp/bin/libgodot-cpp.windows.template_release.x86_64.a + flags: + SCons: platform=windows use_mingw=yes + CMake: -G Ninja + use-mingw: true run-tests: false cache-name: windows-x86_64-mingw - - name: 🍎 macOS (universal) + - name: 🍎 macOS + description: 'universal' os: macos-11 platform: macos artifact-name: godot-cpp-macos-universal-release - artifact-path: bin/libgodot-cpp.macos.template_release.universal.a - flags: arch=universal + artifact-path: + SCons: bin/libgodot-cpp.macos.template_release.universal.a + CMake: build_release/godot-cpp/bin/Release/libgodot-cpp.macos.template_release.a + flags: + SCons: platform=macos arch=universal + CMake: -G Xcode -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED=NO run-tests: false cache-name: macos-universal - - name: 🤖 Android (arm64) + - name: 🤖 Android + description: 'arm64' os: ubuntu-20.04 platform: android artifact-name: godot-cpp-android-arm64-release - artifact-path: bin/libgodot-cpp.android.template_release.arm64.a - flags: arch=arm64 + artifact-path: + SCons: bin/libgodot-cpp.android.template_release.arm64.a + CMake: build_release/godot-cpp/bin/libgodot-cpp.android.template_release.arm64.a + flags: + SCons: platform=android arch=arm64 + CMake: --toolchain ${ANDROID_HOME}/ndk/23.2.8568313/build/cmake/android.toolchain.cmake -G Ninja -DANDROID_PLATFORM=21 run-tests: false cache-name: android-arm64 - - name: 🍏 iOS (arm64) + - name: 🍏 iOS + description: 'arm64' os: macos-11 platform: ios artifact-name: godot-cpp-ios-arm64-release - artifact-path: bin/libgodot-cpp.ios.template_release.arm64.a - flags: arch=arm64 + artifact-path: + SCons: bin/libgodot-cpp.ios.template_release.arm64.a + CMake: build_release/godot-cpp/bin/Release/libgodot-cpp.ios.template_release.a + flags: + SCons: platform=ios arch=arm64 + CMake: -G Xcode -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED=NO run-tests: false cache-name: ios-arm64 - - name: 🌐 Web (wasm32) + - name: 🌐 Web + description: 'wasm32' os: ubuntu-20.04 platform: web artifact-name: godot-cpp-web-wasm32-release - artifact-path: bin/libgodot-cpp.web.template_release.wasm32.a + artifact-path: + SCons: bin/libgodot-cpp.web.template_release.wasm32.a + CMake: build_release/godot-cpp/bin/libgodot-cpp.web.template_release.wasm32.a + flags: + SCons: platform=web + CMake: --toolchain ${EMSDK}/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake -G Ninja run-tests: false cache-name: web-wasm32 @@ -100,60 +175,63 @@ jobs: - name: Setup Godot build cache uses: ./.github/actions/godot-cache with: - cache-name: ${{ matrix.cache-name }} + cache-name: ${{ matrix.platforms.cache-name }} continue-on-error: true - name: Set up Python (for SCons) + if: ${{ matrix.builder.name == 'SCons' }} uses: actions/setup-python@v5 with: python-version: '3.x' - name: Android dependencies - if: ${{ matrix.platform == 'android' }} + if: ${{ matrix.platforms.platform == 'android' }} uses: nttld/setup-ndk@v1 with: ndk-version: r23c link-to-sdk: true - name: Web dependencies - if: ${{ matrix.platform == 'web' }} + if: ${{ matrix.platforms.platform == 'web' }} uses: mymindstorm/setup-emsdk@v14 with: version: ${{env.EM_VERSION}} actions-cache-folder: ${{env.EM_CACHE_FOLDER}} - - name: Setup MinGW for Windows/MinGW build - if: ${{ matrix.platform == 'windows' && matrix.flags == 'use_mingw=yes' }} - uses: egor-tensin/setup-mingw@v2 - with: - version: 12.2.0 - - name: Install scons + if: ${{ matrix.builder.name == 'SCons' }} run: | python -m pip install scons==4.0.0 + - name: Install CMake + if: ${{ matrix.builder.name == 'CMake' }} + uses: ssrobins/install-cmake@v1 + + - name: Install Ninja + if: ${{ matrix.builder.name == 'CMake' }} + uses: ashutoshvarma/setup-ninja@master + + - name: '[TEMP] (CMake Mac) remove preexisting files' + if: ${{ matrix.builder.name == 'CMake' && (matrix.platforms.platform == 'macos' || matrix.platforms.platform == 'ios') }} + uses: JesseTG/rm@v1.0.3 + with: + path: test/project/bin + - name: Generate godot-cpp sources only - run: | - scons platform=${{ matrix.platform }} verbose=yes build_library=no ${{ matrix.flags }} - scons -c + run: ${{ format(matrix.builder.generate_sources, matrix.platforms.flags[matrix.builder.name]) }} - name: Build godot-cpp (debug) - run: | - scons platform=${{ matrix.platform }} verbose=yes target=template_debug ${{ matrix.flags }} + run: ${{ format(matrix.builder.build_godot_cpp_debug, matrix.platforms.flags[matrix.builder.name]) }} - name: Build test without rebuilding godot-cpp (debug) - run: | - cd test - scons platform=${{ matrix.platform }} verbose=yes target=template_debug ${{ matrix.flags }} build_library=no + run: ${{ format(matrix.builder.build_debug, matrix.platforms.flags[matrix.builder.name]) }} - name: Build test and godot-cpp (release) - run: | - cd test - scons platform=${{ matrix.platform }} verbose=yes target=template_release ${{ matrix.flags }} + run: ${{ format(matrix.builder.build_release, matrix.platforms.flags[matrix.builder.name]) }} - name: Download latest Godot artifacts uses: dsnopek/action-download-artifact@1322f74e2dac9feed2ee76a32d9ae1ca3b4cf4e9 - if: ${{ matrix.run-tests }} + if: ${{ matrix.platforms.run-tests }} with: repo: godotengine/godot branch: master @@ -167,7 +245,7 @@ jobs: path: godot-artifacts - name: Run tests - if: ${{ matrix.run-tests }} + if: ${{ matrix.platforms.run-tests }} run: | chmod +x ./godot-artifacts/godot.linuxbsd.editor.x86_64.mono ./godot-artifacts/godot.linuxbsd.editor.x86_64.mono --headless --version @@ -179,73 +257,7 @@ jobs: - name: Upload artifact uses: actions/upload-artifact@v3 with: - name: ${{ matrix.artifact-name }} - path: ${{ matrix.artifact-path }} + name: ${{ matrix.platforms.artifact-name }}-${{ matrix.builder.name }} + path: ${{ matrix.platforms.artifact-path[matrix.builder.name] }} if-no-files-found: error - linux-cmake: - name: 🐧 Build (Linux, GCC, CMake) - runs-on: ubuntu-20.04 - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - submodules: recursive - - - name: Install dependencies - run: | - sudo apt-get update -qq - sudo apt-get install -qqq build-essential pkg-config cmake - - - name: Build godot-cpp - run: | - cmake -DCMAKE_BUILD_TYPE=Release . - make -j $(nproc) VERBOSE=1 - - - name: Build test GDExtension library - run: | - cd test && cmake -DCMAKE_BUILD_TYPE=Release -DGODOT_HEADERS_PATH="../godot-headers" -DCPP_BINDINGS_PATH=".." . - make -j $(nproc) VERBOSE=1 - - linux-cmake-ninja: - name: 🐧 Build (Linux, GCC, CMake Ninja) - runs-on: ubuntu-20.04 - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - submodules: recursive - - - name: Install dependencies - run: | - sudo apt-get update -qq - sudo apt-get install -qqq build-essential pkg-config cmake ninja-build - - - name: Build godot-cpp - run: | - cmake -DCMAKE_BUILD_TYPE=Release -GNinja . - cmake --build . -j $(nproc) --verbose - - - name: Build test GDExtension library - run: | - cd test && cmake -DCMAKE_BUILD_TYPE=Release -DGODOT_HEADERS_PATH="../godot-headers" -DCPP_BINDINGS_PATH=".." -GNinja . - cmake --build . -j $(nproc) --verbose - - windows-msvc-cmake: - name: 🏁 Build (Windows, MSVC, CMake) - runs-on: windows-2019 - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - submodules: recursive - - - name: Build godot-cpp - run: | - cmake -DCMAKE_BUILD_TYPE=Release -G"Visual Studio 16 2019" . - cmake --build . --verbose - - - name: Build test GDExtension library - run: | - cd test && cmake -DCMAKE_BUILD_TYPE=Release -DGODOT_HEADERS_PATH="../godot-headers" -DCPP_BINDINGS_PATH=".." -G"Visual Studio 16 2019" . - cmake --build . --verbose From 50e09e7f8cf4a0992f5224364965b34e35f9cd7b Mon Sep 17 00:00:00 2001 From: Vano Date: Fri, 3 May 2024 21:36:34 +0300 Subject: [PATCH 2/5] exclude CMake IOS build for now --- .github/workflows/ci.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d1d9dc850..e5d195914 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,6 +16,13 @@ jobs: strategy: fail-fast: false matrix: + exclude: + - builder: + name: CMake + + platforms: + name: 🍏 iOS + builder: - name: SCons generate_sources: | From be5fc41e4301b083c9d6f69aa8439b71849babe2 Mon Sep 17 00:00:00 2001 From: Vano Date: Fri, 3 May 2024 21:43:21 +0300 Subject: [PATCH 3/5] ccache builds --- .github/workflows/ci.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e5d195914..5b2083506 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,7 +42,7 @@ jobs: - name: CMake generate_sources: | - cmake {0} -DCMAKE_BUILD_TYPE=Debug -B build test + cmake {0} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache -B build test build_godot_cpp_debug: | cmake --build build --config Debug --target godot-cpp @@ -51,7 +51,7 @@ jobs: cmake --build build --config Debug build_release: | - cmake {0} -DCMAKE_BUILD_TYPE=Release -DTARGET=TEMPLATE_RELEASE -B build_release test + cmake {0} -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DTARGET=TEMPLATE_RELEASE -B build_release test cmake --build build_release --config Release platforms: @@ -214,6 +214,12 @@ jobs: if: ${{ matrix.builder.name == 'CMake' }} uses: ssrobins/install-cmake@v1 + - name: Install ccache + if: ${{ matrix.builder.name == 'CMake' }} + uses: hendrikmuhs/ccache-action@v1.2 + with: + key: ${{ matrix.platforms.cache-name }} + - name: Install Ninja if: ${{ matrix.builder.name == 'CMake' }} uses: ashutoshvarma/setup-ninja@master From c9fcc61dd8b00e665c7777db7c4fd8bfe2e49dde Mon Sep 17 00:00:00 2001 From: Vano Date: Fri, 3 May 2024 22:10:35 +0300 Subject: [PATCH 4/5] remove old workaround, exclude CMake IOS build --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5b2083506..889e1092f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,6 +16,8 @@ jobs: strategy: fail-fast: false matrix: + + # TODO: remove after CMake IOS config is ready exclude: - builder: name: CMake @@ -263,8 +265,6 @@ jobs: chmod +x ./godot-artifacts/godot.linuxbsd.editor.x86_64.mono ./godot-artifacts/godot.linuxbsd.editor.x86_64.mono --headless --version cd test - # Need to run the editor so .godot is generated... but it crashes! Ignore that :-) - (cd project && (timeout 10 ../../godot-artifacts/godot.linuxbsd.editor.x86_64.mono --editor --headless --quit >/dev/null 2>&1 || true)) GODOT=../godot-artifacts/godot.linuxbsd.editor.x86_64.mono ./run-tests.sh - name: Upload artifact From cbf826b704eee6906b45c732a2ee7de5300e44a5 Mon Sep 17 00:00:00 2001 From: Vano Date: Fri, 3 May 2024 23:56:16 +0300 Subject: [PATCH 5/5] remove old workaround --- .github/workflows/ci.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 889e1092f..c9ff10d12 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -182,6 +182,7 @@ jobs: submodules: recursive - name: Setup Godot build cache + if: ${{ matrix.builder.name == 'SCons' }} uses: ./.github/actions/godot-cache with: cache-name: ${{ matrix.platforms.cache-name }} @@ -226,12 +227,6 @@ jobs: if: ${{ matrix.builder.name == 'CMake' }} uses: ashutoshvarma/setup-ninja@master - - name: '[TEMP] (CMake Mac) remove preexisting files' - if: ${{ matrix.builder.name == 'CMake' && (matrix.platforms.platform == 'macos' || matrix.platforms.platform == 'ios') }} - uses: JesseTG/rm@v1.0.3 - with: - path: test/project/bin - - name: Generate godot-cpp sources only run: ${{ format(matrix.builder.generate_sources, matrix.platforms.flags[matrix.builder.name]) }}