Skip to content

Commit cda7b3d

Browse files
committed
Use cache_path instead of deprecated env var SCONS_CACHE
1 parent 93ff473 commit cda7b3d

File tree

5 files changed

+13
-18
lines changed

5 files changed

+13
-18
lines changed

.github/workflows/fuzzer.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
#mkdir bin/
8181
#mv Godot_v4.0-beta3_linux.x86_64 bin/godot.linuxbsd.editor.dev.x86_64.san
8282
83-
scons target=editor use_ubsan=yes use_asan=yes linker=gold dev_build=yes CCFLAGS="-fpie" LINKFLAGS="-no-pie"
83+
scons target=editor use_ubsan=yes use_asan=yes linker=gold dev_build=yes CCFLAGS="-fpie" LINKFLAGS="-no-pie" "cache_path=${{github.workspace}}/.scons_cache/"
8484
8585
- uses: actions/upload-artifact@v4
8686
with:

.github/workflows/linux.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -185,10 +185,14 @@ jobs:
185185
# We should always be explicit with our flags usage here since it's gonna be sure to always set those flags
186186
- name: Compilation
187187
env:
188+
# `SCONS_CACHE` became deprecated since
189+
# https://github.com/godotengine/godot/commit/0e4a4e3c4d602691ce1b4fc6a721c5c637ead57f
190+
# However since we are also building versions preceding that change,
191+
# we have to keep it in addition to the new parameter
188192
SCONS_CACHE: ${{github.workspace}}/.scons_cache/
189193
run: |
190194
PATH=${GITHUB_WORKSPACE}/x86_64-godot-linux-gnu_sdk-buildroot/bin:$PATH
191-
scons verbose=yes warnings=${{matrix.warnings}} werror=${{matrix.werror}} platform=linuxbsd tests=no dev_build=no target=${{matrix.target}} production=${{matrix.production}} precision=${{matrix.precision}}
195+
scons verbose=yes warnings=${{matrix.warnings}} werror=${{matrix.werror}} platform=linuxbsd tests=no dev_build=no target=${{matrix.target}} production=${{matrix.production}} precision=${{matrix.precision}} "cache_path=${{github.workspace}}/.scons_cache/"
192196
193197
# Make build available
194198
- uses: actions/upload-artifact@v4

.github/workflows/macos.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,8 @@ jobs:
8080
8181
# We should always be explicit with our flags usage here since it's gonna be sure to always set those flags
8282
- name: Compilation
83-
env:
84-
SCONS_CACHE: ${{github.workspace}}/.scons_cache/
8583
run: |
86-
scons arch=${{matrix.arch}} verbose=yes warnings=extra werror=yes platform=macos tests=no target=${{matrix.target}} dev_build=no production=yes
84+
scons arch=${{matrix.arch}} verbose=yes warnings=extra werror=yes platform=macos tests=no target=${{matrix.target}} dev_build=no production=yes "cache_path=${{github.workspace}}/.scons_cache/"
8785
8886
# Make build available
8987
- uses: actions/upload-artifact@v4

.github/workflows/mono.yml

+4-9
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,8 @@ jobs:
7777
7878
# We should always be explicit with our flags usage here since it's gonna be sure to always set those flags
7979
- name: Compile Godot (module_mono_enabled=yes mono_glue=no)
80-
env:
81-
SCONS_CACHE: ${{github.workspace}}/.scons_cache/
8280
run: |
83-
scons verbose=yes warnings=all werror=yes platform=linuxbsd tests=no target=editor dev_build=no debug_symbols=no module_mono_enabled=yes mono_glue=no copy_mono_root=yes
81+
scons verbose=yes warnings=all werror=yes platform=linuxbsd tests=no target=editor dev_build=no debug_symbols=no module_mono_enabled=yes mono_glue=no copy_mono_root=yes "cache_path=${{github.workspace}}/.scons_cache/"
8482
8583
- name: Generate Mono Glue
8684
run: |
@@ -170,10 +168,8 @@ jobs:
170168
171169
# We should always be explicit with our flags usage here since it's gonna be sure to always set those flags
172170
- name: Compilation
173-
env:
174-
SCONS_CACHE: ${{github.workspace}}/.scons_cache/
175171
run: |
176-
scons verbose=yes warnings=all werror=yes platform=linuxbsd tests=no target=editor dev_build=no debug_symbols=no module_mono_enabled=yes mono_glue=yes mono_static=yes copy_mono_root=yes
172+
scons verbose=yes warnings=all werror=yes platform=linuxbsd tests=no target=editor dev_build=no debug_symbols=no module_mono_enabled=yes mono_glue=yes mono_static=yes copy_mono_root=yes "cache_path=${{github.workspace}}/.scons_cache/"
177173
178174
# Make build available
179175
- uses: actions/upload-artifact@v4
@@ -216,7 +212,7 @@ jobs:
216212
id: windows-editor-mono-cache
217213
uses: actions/cache@v4
218214
with:
219-
path: /.scons_cache/
215+
path: ${{github.workspace}}/.scons_cache/
220216
key: ${{github.job}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}
221217
restore-keys: |
222218
${{github.job}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}
@@ -255,9 +251,8 @@ jobs:
255251
- name: Compilation
256252
env:
257253
SCONS_CACHE_MSVC_CONFIG: true
258-
SCONS_CACHE: /.scons_cache/
259254
run: |
260-
scons verbose=yes warnings=all werror=yes platform=windows tests=no target=editor dev_build=no debug_symbols=no module_mono_enabled=yes mono_glue=yes copy_mono_root=yes mono_static=yes
255+
scons verbose=yes warnings=all werror=yes platform=windows tests=no target=editor dev_build=no debug_symbols=no module_mono_enabled=yes mono_glue=yes copy_mono_root=yes mono_static=yes "cache_path=${{github.workspace}}/.scons_cache/"
261256
262257
# TODO Enhancement: Run tests? Such tests are able to run from Godot 4.0 only
263258
# Execute unit tests for the editor

.github/workflows/windows.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
#uses: ${{matrix.cache_action}}
7878
uses: actions/cache@v4
7979
with:
80-
path: /.scons_cache/
80+
path: ${{github.workspace}}/.scons_cache/
8181
key: ${{matrix.executable_name}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}
8282
restore-keys: |
8383
${{matrix.executable_name}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}
@@ -119,10 +119,8 @@ jobs:
119119
# TODO Enhancement: we'd like to use `warnings=extra` with MSVC but Godot doesn't compile yet with that level of warnings.
120120
# See https://github.com/godotengine/godot/issues/66537
121121
- name: Compilation
122-
env:
123-
SCONS_CACHE: /.scons_cache/
124122
run: |
125-
scons verbose=yes warnings=all werror=yes platform=windows tests=no target=${{matrix.target}} dev_build=no precision=${{matrix.precision}} tracy=${{matrix.tracy}} production=yes
123+
scons verbose=yes warnings=all werror=yes platform=windows tests=no target=${{matrix.target}} dev_build=no precision=${{matrix.precision}} tracy=${{matrix.tracy}} production=yes "cache_path=${{github.workspace}}/.scons_cache/"
126124
127125
- name: "Rename executable"
128126
if: ${{ matrix.tracy == 'yes' }}

0 commit comments

Comments
 (0)