diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-05-18 16:22:25 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-05-18 16:22:25 +0200 |
| commit | a28c9701edbe51a66fef317a7f3155a3ad682ed6 (patch) | |
| tree | 46b478bc68129dc49ad0eb114eba64d2b80de108 | |
| parent | 18112ba368030bed71e78425388d9b6adfbc87a6 (diff) | |
| download | redot-engine-a28c9701edbe51a66fef317a7f3155a3ad682ed6.tar.gz | |
CI: Use GODOT_BASE_BRANCH for the godot-cpp checkout
| -rw-r--r-- | .github/workflows/android_builds.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/ios_builds.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/linux_builds.yml | 3 | ||||
| -rw-r--r-- | .github/workflows/macos_builds.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/web_builds.yml | 2 | ||||
| -rw-r--r-- | .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 1912189d1c..afc73a462f 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 a32b25a8e7..63ecabd957 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 44765ee32e..dc313359ab 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 8822566c48..6e0fbbf461 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 24cb0adac8..2ae238caa6 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 0f37db5f14..182ae2fc8c 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 |