From de25845e8d5b7465e881ada7ca4c458d12a9492e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Wed, 11 Sep 2024 13:09:47 +0200
Subject: [PATCH] CI: Update base branch to 3.6

---
 .github/workflows/android_builds.yml    | 2 +-
 .github/workflows/ios_builds.yml        | 2 +-
 .github/workflows/javascript_builds.yml | 2 +-
 .github/workflows/linux_builds.yml      | 2 +-
 .github/workflows/macos_builds.yml      | 2 +-
 .github/workflows/server_builds.yml     | 2 +-
 .github/workflows/windows_builds.yml    | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/android_builds.yml b/.github/workflows/android_builds.yml
index 13da21b85c55..fca2cb91a3d3 100644
--- a/.github/workflows/android_builds.yml
+++ b/.github/workflows/android_builds.yml
@@ -5,7 +5,7 @@ on:
 # Global Settings
 env:
   # Only used for the cache key. Increment version to force clean build.
-  GODOT_BASE_BRANCH: 3.x
+  GODOT_BASE_BRANCH: 3.6
   SCONSFLAGS: verbose=yes warnings=all werror=yes debug_symbols=no
 
 concurrency:
diff --git a/.github/workflows/ios_builds.yml b/.github/workflows/ios_builds.yml
index 1f0bfed3fb46..40398b51e7c9 100644
--- a/.github/workflows/ios_builds.yml
+++ b/.github/workflows/ios_builds.yml
@@ -5,7 +5,7 @@ on:
 # Global Settings
 env:
   # Only used for the cache key. Increment version to force clean build.
-  GODOT_BASE_BRANCH: 3.x
+  GODOT_BASE_BRANCH: 3.6
   SCONSFLAGS: verbose=yes warnings=all werror=yes debug_symbols=no
 
 concurrency:
diff --git a/.github/workflows/javascript_builds.yml b/.github/workflows/javascript_builds.yml
index c3fde9b23a67..94b321c691ed 100644
--- a/.github/workflows/javascript_builds.yml
+++ b/.github/workflows/javascript_builds.yml
@@ -5,7 +5,7 @@ on:
 # Global Settings
 env:
   # Only used for the cache key. Increment version to force clean build.
-  GODOT_BASE_BRANCH: 3.x
+  GODOT_BASE_BRANCH: 3.6
   SCONSFLAGS: verbose=yes warnings=all werror=yes debug_symbols=no
   EM_VERSION: 3.1.39
   EM_CACHE_FOLDER: "emsdk-cache"
diff --git a/.github/workflows/linux_builds.yml b/.github/workflows/linux_builds.yml
index 2f69ca228568..3910941d2044 100644
--- a/.github/workflows/linux_builds.yml
+++ b/.github/workflows/linux_builds.yml
@@ -5,7 +5,7 @@ on:
 # Global Settings
 env:
   # Only used for the cache key. Increment version to force clean build.
-  GODOT_BASE_BRANCH: 3.x
+  GODOT_BASE_BRANCH: 3.6
   SCONSFLAGS: verbose=yes warnings=all werror=yes
 
 concurrency:
diff --git a/.github/workflows/macos_builds.yml b/.github/workflows/macos_builds.yml
index ad73d6495834..07de3fc47636 100644
--- a/.github/workflows/macos_builds.yml
+++ b/.github/workflows/macos_builds.yml
@@ -5,7 +5,7 @@ on:
 # Global Settings
 env:
   # Only used for the cache key. Increment version to force clean build.
-  GODOT_BASE_BRANCH: 3.x
+  GODOT_BASE_BRANCH: 3.6
   SCONSFLAGS: verbose=yes warnings=all werror=yes debug_symbols=no
 
 concurrency:
diff --git a/.github/workflows/server_builds.yml b/.github/workflows/server_builds.yml
index 8758574015c7..e62e135822bb 100644
--- a/.github/workflows/server_builds.yml
+++ b/.github/workflows/server_builds.yml
@@ -5,7 +5,7 @@ on:
 # Global Settings
 env:
   # Only used for the cache key. Increment version to force clean build.
-  GODOT_BASE_BRANCH: 3.x
+  GODOT_BASE_BRANCH: 3.6
   SCONSFLAGS: verbose=yes warnings=all werror=yes debug_symbols=no module_mono_enabled=yes mono_static=yes mono_glue=no
 
 concurrency:
diff --git a/.github/workflows/windows_builds.yml b/.github/workflows/windows_builds.yml
index ea3e9054ec18..cf5ba334bd28 100644
--- a/.github/workflows/windows_builds.yml
+++ b/.github/workflows/windows_builds.yml
@@ -6,7 +6,7 @@ on:
 # 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: 3.x
+  GODOT_BASE_BRANCH: 3.6
   SCONSFLAGS: verbose=yes warnings=all werror=yes debug_symbols=no
   SCONS_CACHE_MSVC_CONFIG: true