From a28c9701edbe51a66fef317a7f3155a3ad682ed6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Thu, 18 May 2023 16:22:25 +0200 Subject: [PATCH] CI: Use GODOT_BASE_BRANCH for the godot-cpp checkout --- .github/workflows/android_builds.yml | 2 +- .github/workflows/ios_builds.yml | 2 +- .github/workflows/linux_builds.yml | 3 ++- .github/workflows/macos_builds.yml | 2 +- .github/workflows/web_builds.yml | 2 +- .github/workflows/windows_builds.yml | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/android_builds.yml b/.github/workflows/android_builds.yml index 1912189d1c9..afc73a462fd 100644 --- a/.github/workflows/android_builds.yml +++ b/.github/workflows/android_builds.yml @@ -4,7 +4,7 @@ on: # Global Settings env: - # Only used for the cache key. Increment version to force clean build. + # Used for the cache key. Add version suffix to force clean build. GODOT_BASE_BRANCH: master SCONSFLAGS: verbose=yes warnings=extra werror=yes debug_symbols=no module_text_server_fb_enabled=yes diff --git a/.github/workflows/ios_builds.yml b/.github/workflows/ios_builds.yml index a32b25a8e71..63ecabd9577 100644 --- a/.github/workflows/ios_builds.yml +++ b/.github/workflows/ios_builds.yml @@ -4,7 +4,7 @@ on: # Global Settings env: - # Only used for the cache key. Increment version to force clean build. + # Used for the cache key. Add version suffix to force clean build. GODOT_BASE_BRANCH: master SCONSFLAGS: verbose=yes warnings=extra werror=yes debug_symbols=no module_text_server_fb_enabled=yes diff --git a/.github/workflows/linux_builds.yml b/.github/workflows/linux_builds.yml index 44765ee32e9..dc313359ab8 100644 --- a/.github/workflows/linux_builds.yml +++ b/.github/workflows/linux_builds.yml @@ -4,7 +4,7 @@ on: # Global Settings env: - # Only used for the cache key. Increment version to force clean build. + # Used for the cache key, and godot-cpp checkout. Add version suffix to force clean build. GODOT_BASE_BRANCH: master SCONSFLAGS: verbose=yes warnings=extra werror=yes module_text_server_fb_enabled=yes DOTNET_NOLOGO: true @@ -182,6 +182,7 @@ jobs: uses: actions/checkout@v3 with: repository: godotengine/godot-cpp + ref: ${{ env.GODOT_BASE_BRANCH }} submodules: 'recursive' path: 'godot-cpp' diff --git a/.github/workflows/macos_builds.yml b/.github/workflows/macos_builds.yml index 8822566c489..6e0fbbf461b 100644 --- a/.github/workflows/macos_builds.yml +++ b/.github/workflows/macos_builds.yml @@ -4,7 +4,7 @@ on: # Global Settings env: - # Only used for the cache key. Increment version to force clean build. + # Used for the cache key. Add version suffix to force clean build. GODOT_BASE_BRANCH: master SCONSFLAGS: verbose=yes warnings=extra werror=yes module_text_server_fb_enabled=yes diff --git a/.github/workflows/web_builds.yml b/.github/workflows/web_builds.yml index 24cb0adac85..2ae238caa6c 100644 --- a/.github/workflows/web_builds.yml +++ b/.github/workflows/web_builds.yml @@ -4,7 +4,7 @@ on: # Global Settings env: - # Only used for the cache key. Increment version to force clean build. + # Used for the cache key. Add version suffix to force clean build. GODOT_BASE_BRANCH: master SCONSFLAGS: verbose=yes warnings=extra werror=yes debug_symbols=no EM_VERSION: 3.1.18 diff --git a/.github/workflows/windows_builds.yml b/.github/workflows/windows_builds.yml index 0f37db5f145..182ae2fc8c4 100644 --- a/.github/workflows/windows_builds.yml +++ b/.github/workflows/windows_builds.yml @@ -5,7 +5,7 @@ on: # Global Settings # SCONS_CACHE for windows must be set in the build environment env: - # Only used for the cache key. Increment version to force clean build. + # Used for the cache key. Add version suffix to force clean build. GODOT_BASE_BRANCH: master SCONSFLAGS: verbose=yes warnings=extra werror=yes module_text_server_fb_enabled=yes SCONS_CACHE_MSVC_CONFIG: true