Merge pull request #77204 from akien-mga/4.0-ci-base-branch

[4.0] CI: Change GODOT_BASE_BRANCH to 4.0, checkout that branch for godot-cpp

6 files changed, 13 insertions, 12 deletions

diff --git a/.github/workflows/android_builds.yml b/.github/workflows/android_builds.yml
index 1912189d1c..1e320e4c2d 100644
--- a/.github/workflows/android_builds.yml
+++ b/.github/workflows/android_builds.yml
@@ -4,8 +4,8 @@ on:
 
 # Global Settings
 env:
-  # Only used for the cache key. Increment version to force clean build.
-  GODOT_BASE_BRANCH: master
+  # Used for the cache key. Add version suffix to force clean build.
+  GODOT_BASE_BRANCH: '4.0'
   SCONSFLAGS: verbose=yes warnings=extra werror=yes debug_symbols=no module_text_server_fb_enabled=yes
 
 concurrency:
diff --git a/.github/workflows/ios_builds.yml b/.github/workflows/ios_builds.yml
index a32b25a8e7..07febf1bf4 100644
--- a/.github/workflows/ios_builds.yml
+++ b/.github/workflows/ios_builds.yml
@@ -4,8 +4,8 @@ on:
 
 # Global Settings
 env:
-  # Only used for the cache key. Increment version to force clean build.
-  GODOT_BASE_BRANCH: master
+  # Used for the cache key. Add version suffix to force clean build.
+  GODOT_BASE_BRANCH: '4.0'
   SCONSFLAGS: verbose=yes warnings=extra werror=yes debug_symbols=no module_text_server_fb_enabled=yes
 
 concurrency:
diff --git a/.github/workflows/linux_builds.yml b/.github/workflows/linux_builds.yml
index 44765ee32e..40bc1a3ba2 100644
--- a/.github/workflows/linux_builds.yml
+++ b/.github/workflows/linux_builds.yml
@@ -4,8 +4,8 @@ on:
 
 # Global Settings
 env:
-  # Only used for the cache key. Increment version to force clean build.
-  GODOT_BASE_BRANCH: master
+  # Used for the cache key, and godot-cpp checkout. Add version suffix to force clean build.
+  GODOT_BASE_BRANCH: '4.0'
   SCONSFLAGS: verbose=yes warnings=extra werror=yes module_text_server_fb_enabled=yes
   DOTNET_NOLOGO: true
   DOTNET_CLI_TELEMETRY_OPTOUT: 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 8822566c48..3595476d13 100644
--- a/.github/workflows/macos_builds.yml
+++ b/.github/workflows/macos_builds.yml
@@ -4,8 +4,8 @@ on:
 
 # Global Settings
 env:
-  # Only used for the cache key. Increment version to force clean build.
-  GODOT_BASE_BRANCH: master
+  # Used for the cache key. Add version suffix to force clean build.
+  GODOT_BASE_BRANCH: '4.0'
   SCONSFLAGS: verbose=yes warnings=extra werror=yes module_text_server_fb_enabled=yes
 
 concurrency:
diff --git a/.github/workflows/web_builds.yml b/.github/workflows/web_builds.yml
index 24cb0adac8..0e4f6ca634 100644
--- a/.github/workflows/web_builds.yml
+++ b/.github/workflows/web_builds.yml
@@ -4,8 +4,8 @@ on:
 
 # Global Settings
 env:
-  # Only used for the cache key. Increment version to force clean build.
-  GODOT_BASE_BRANCH: master
+  # Used for the cache key. Add version suffix to force clean build.
+  GODOT_BASE_BRANCH: '4.0'
   SCONSFLAGS: verbose=yes warnings=extra werror=yes debug_symbols=no
   EM_VERSION: 3.1.18
   EM_CACHE_FOLDER: "emsdk-cache"
diff --git a/.github/workflows/windows_builds.yml b/.github/workflows/windows_builds.yml
index da90e9641c..2784423ea7 100644
--- a/.github/workflows/windows_builds.yml
+++ b/.github/workflows/windows_builds.yml
@@ -5,8 +5,8 @@ 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.
-  GODOT_BASE_BRANCH: master
+  # Used for the cache key. Add version suffix to force clean build.
+  GODOT_BASE_BRANCH: '4.0'
   SCONSFLAGS: verbose=yes warnings=extra werror=yes module_text_server_fb_enabled=yes
   SCONS_CACHE_MSVC_CONFIG: true