From 922687f15ad7ee0c8f87e3817a60231ad7b82b19 Mon Sep 17 00:00:00 2001 From: Marc Gilleron Date: Sun, 31 Dec 2023 21:29:06 +0000 Subject: [PATCH] Move CI builds to Godot 4.2, added Float64 builds on Windows --- .github/workflows/extension_windows.yml | 4 ++-- .github/workflows/linux.yml | 30 +++++++++++++------------ .github/workflows/macos.yml | 8 +++---- .github/workflows/mono.yml | 2 +- .github/workflows/windows.yml | 24 +++++++++++++------- 5 files changed, 39 insertions(+), 29 deletions(-) diff --git a/.github/workflows/extension_windows.yml b/.github/workflows/extension_windows.yml index 673cfbc73..7bbc75b8d 100644 --- a/.github/workflows/extension_windows.yml +++ b/.github/workflows/extension_windows.yml @@ -23,13 +23,13 @@ jobs: strategy: matrix: include: - - name: Editor build + - name: master Editor target: editor dev_build: no #cache_action: actions/cache@v3 executable_name: libvoxel.windows.editor.x86_64.dll - - name: Release build + - name: master Release target: template_release dev_build: no #cache_action: actions/cache@v3 diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index ec665ad4c..f32be2b79 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -17,8 +17,9 @@ jobs: strategy: matrix: include: - # Just to check if building still works in that version - - name: Editor debug build (4.0) + # --- Check past and future Godot versions --- + + - name: 4.0 Editor Debug precision: single target: editor dev_build: yes @@ -31,55 +32,56 @@ jobs: # There might be other issues cropping up, since there doesn't seem to be an official CI checking this. warnings: all - # Just to check if building works in Godot master - - name: Editor debug build (master) + - name: 4.1 Editor Debug precision: single target: editor dev_build: yes #dev_mode: yes # Flags specified manually. We want extra checks but we don't want to compile tests production: no executable_name: godot.linuxbsd.editor.dev.x86_64 - godot_base_branch: "master" + godot_base_branch: "4.1" warnings: extra - - - name: Editor debug build + + - name: master Editor Debug precision: single target: editor dev_build: yes #dev_mode: yes # Flags specified manually. We want extra checks but we don't want to compile tests production: no executable_name: godot.linuxbsd.editor.dev.x86_64 - godot_base_branch: "4.1" + godot_base_branch: "master" warnings: extra - - name: Editor build + # --- Builds with artifacts --- + + - name: 4.2 Editor precision: single target: editor dev_build: no #dev_mode: no production: yes executable_name: godot.linuxbsd.editor.x86_64 - godot_base_branch: "4.1" + godot_base_branch: "4.2" warnings: extra - - name: Template build + - name: 4.2 Template precision: single target: template_release dev_build: no #dev_mode: no production: yes executable_name: godot.linuxbsd.template_release.x86_64 - godot_base_branch: "4.1" + godot_base_branch: "4.2" warnings: extra - - name: Editor build with 64-bit floats + - name: 4.2 Editor Float64 precision: double target: editor dev_build: no #dev_mode: no production: yes executable_name: godot.linuxbsd.editor.double.x86_64 - godot_base_branch: "4.1" + godot_base_branch: "4.2" warnings: extra steps: diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 111e4a210..6c0ec31ad 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -18,15 +18,15 @@ jobs: strategy: matrix: include: - - name: Editor build + - name: 4.2 Editor target: editor executable_name: godot.macos.editor.x86_64 - godot_base_branch: "4.1" + godot_base_branch: "4.2" - - name: Release build + - name: 4.2 Template target: template_release executable_name: godot.macos.template_release.x86_64 - godot_base_branch: "4.1" + godot_base_branch: "4.2" steps: # Clone Godot diff --git a/.github/workflows/mono.yml b/.github/workflows/mono.yml index ed2059b51..84ade2337 100644 --- a/.github/workflows/mono.yml +++ b/.github/workflows/mono.yml @@ -7,7 +7,7 @@ on: # Global Cache Settings env: - GODOT_BASE_BRANCH: "4.1" + GODOT_BASE_BRANCH: "4.2" SCONS_CACHE_LIMIT: 4096 jobs: diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 8338b6e32..53b28233e 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -8,7 +8,7 @@ on: # Global Cache Settings # SCONS_CACHE for windows must be set in the build environment env: - GODOT_BASE_BRANCH: "4.1" + GODOT_BASE_BRANCH: "4.2" SCONS_CACHE_MSVC_CONFIG: true SCONS_CACHE_LIMIT: 4096 @@ -21,13 +21,21 @@ jobs: strategy: matrix: include: - - name: Editor build + - name: 4.2 Editor target: editor + precision: single #cache_action: actions/cache@v3 executable_name: godot.windows.editor.x86_64.exe - - name: Release build + - name: 4.2 Editor Float64 + target: editor + precision: double + #cache_action: actions/cache@v3 + executable_name: godot.windows.editor.double.x86_64.exe + + - name: 4.2 Template target: template_release + precision: single # I don't remember why this one used a different action in the past? # Either way, Github Actions does not support matrix variables in `uses` yet. # See https://github.com/orgs/community/discussions/9049 @@ -54,11 +62,11 @@ jobs: uses: actions/cache@v3 with: path: /.scons_cache/ - key: ${{github.job}}-${{matrix.target}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}} + key: ${{matrix.executable_name}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}} restore-keys: | - ${{github.job}}-${{matrix.target}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}} - ${{github.job}}-${{matrix.target}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}} - ${{github.job}}-${{matrix.target}}-${{env.GODOT_BASE_BRANCH}} + ${{matrix.executable_name}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}} + ${{matrix.executable_name}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}} + ${{matrix.executable_name}}-${{env.GODOT_BASE_BRANCH}} # Use python 3.x release (works cross platform; best to keep self contained in it's own step) - name: Set up Python 3.x @@ -84,7 +92,7 @@ jobs: env: SCONS_CACHE: /.scons_cache/ run: | - scons -j2 verbose=yes warnings=all werror=yes platform=windows tests=no target=${{matrix.target}} dev_build=no + scons -j2 verbose=yes warnings=all werror=yes platform=windows tests=no target=${{matrix.target}} dev_build=no precision=${{matrix.precision}} # Make build available - uses: actions/upload-artifact@v3