CI: Use correct godot-cpp branch

This commit is contained in:
David Snopek 2025-03-03 11:29:39 -06:00
parent 9f68a81659
commit 70bace7482
2 changed files with 7 additions and 4 deletions

View file

@ -1,9 +1,6 @@
name: Build godot-cpp name: Build godot-cpp
description: Build godot-cpp with the provided options. description: Build godot-cpp with the provided options.
env:
GODOT_CPP_BRANCH: 4.4
inputs: inputs:
bin: bin:
description: Path to the Godot binary. description: Path to the Godot binary.
@ -16,6 +13,10 @@ inputs:
description: The SCons cache path. description: The SCons cache path.
default: ${{ github.workspace }}/.scons_cache/ default: ${{ github.workspace }}/.scons_cache/
type: string type: string
godot-cpp-branch:
description: The godot-cpp branch.
default: master
type: string
runs: runs:
using: composite using: composite
@ -25,7 +26,7 @@ runs:
with: with:
submodules: recursive submodules: recursive
repository: godotengine/godot-cpp repository: godotengine/godot-cpp
ref: ${{ env.GODOT_CPP_BRANCH }} ref: ${{ inputs.godot-cpp-branch }}
path: godot-cpp path: godot-cpp
- name: Extract API - name: Extract API

View file

@ -6,6 +6,7 @@ on:
env: env:
# Used for the cache key. Add version suffix to force clean build. # Used for the cache key. Add version suffix to force clean build.
GODOT_BASE_BRANCH: master GODOT_BASE_BRANCH: master
GODOT_CPP_BRANCH: 4.4
SCONSFLAGS: verbose=yes warnings=extra werror=yes module_text_server_fb_enabled=yes strict_checks=yes SCONSFLAGS: verbose=yes warnings=extra werror=yes module_text_server_fb_enabled=yes strict_checks=yes
DOTNET_NOLOGO: true DOTNET_NOLOGO: true
DOTNET_CLI_TELEMETRY_OPTOUT: true DOTNET_CLI_TELEMETRY_OPTOUT: true
@ -174,6 +175,7 @@ jobs:
with: with:
bin: ${{ matrix.bin }} bin: ${{ matrix.bin }}
scons-flags: target=template_debug dev_build=yes verbose=yes scons-flags: target=template_debug dev_build=yes verbose=yes
godot-cpp-branch: ${{ env.GODOT_CPP_BRANCH }}
- name: Save Godot build cache - name: Save Godot build cache
uses: ./.github/actions/godot-cache-save uses: ./.github/actions/godot-cache-save