Skip to content

Commit 563b574

Browse files
committed
CI: apply --disallow-focus to all itest jobs
1 parent 742cc35 commit 563b574

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

.github/composite/godot-itest/action.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,10 +179,12 @@ runs:
179179
# * grep -q: no output, use exit code 0 if found -> thus also &&
180180
# * pkill: stop Godot execution (since it hangs in headless mode); simple 'head -1' did not work as expected
181181
# * exit: the terminated process would return 143, but this is more explicit and future-proof
182+
#
183+
# --disallow-focus: fail if #[itest(focus)] is encountered, to prevent running only a few tests for full CI
182184
run: |
183185
cd itest/godot
184186
echo "OUTCOME=itest" >> $GITHUB_ENV
185-
$GODOT4_BIN --headless ${{ inputs.godot-args }} 2>&1 \
187+
$GODOT4_BIN --headless -- --disallow-focus ${{ inputs.godot-args }} 2>&1 \
186188
| tee "${{ runner.temp }}/log.txt" \
187189
| tee >(grep -E "SCRIPT ERROR:|Can't open dynamic library" -q && {
188190
printf "\n::error::godot-itest: unrecoverable Godot error, abort...\n";

.github/workflows/full-ci.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,6 @@ jobs:
153153
# Naming: {os}[-{runtimeVersion}]-{apiVersion}
154154
# runtimeVersion = version of Godot binary; apiVersion = version of GDExtension API against which gdext is compiled.
155155

156-
# --disallow-focus: fail if #[itest(focus)] is encountered, to prevent running only a few tests for full CI
157-
158156
# Order this way because macOS typically has the longest duration, followed by Windows, so it benefits total workflow execution time.
159157
# Additionally, the 'linux (msrv *)' special case will then be listed next to the other 'linux' jobs.
160158
# Note: Windows uses '--target x86_64-pc-windows-msvc' by default as Cargo argument.
@@ -253,7 +251,6 @@ jobs:
253251
os: ubuntu-20.04
254252
artifact-name: linux-memcheck-clang-nightly
255253
godot-binary: godot.linuxbsd.editor.dev.x86_64.llvm.san
256-
godot-args: -- --disallow-focus
257254
rust-toolchain: nightly
258255
rust-env-rustflags: -Zrandomize-layout -Zsanitizer=address
259256
rust-extra-args: --features godot/custom-godot
@@ -264,7 +261,6 @@ jobs:
264261
os: ubuntu-20.04
265262
artifact-name: linux-memcheck-clang-4.0.4
266263
godot-binary: godot.linuxbsd.editor.dev.x86_64.llvm.san
267-
godot-args: -- --disallow-focus
268264
godot-prebuilt-patch: '4.0.4'
269265
rust-toolchain: nightly
270266
rust-env-rustflags: -Zrandomize-layout -Zsanitizer=address
@@ -279,7 +275,7 @@ jobs:
279275
with:
280276
artifact-name: godot-${{ matrix.artifact-name }}
281277
godot-binary: ${{ matrix.godot-binary }}
282-
godot-args: ${{ matrix.godot-args }}
278+
godot-args: ${{ matrix.godot-args }} # currently unused
283279
godot-prebuilt-patch: ${{ matrix.godot-prebuilt-patch }}
284280
rust-extra-args: ${{ matrix.rust-extra-args }} --features godot/codegen-full
285281
rust-toolchain: ${{ matrix.rust-toolchain || 'stable' }}

.github/workflows/minimal-ci.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@ jobs:
165165
os: ubuntu-20.04
166166
artifact-name: linux-memcheck-clang-nightly
167167
godot-binary: godot.linuxbsd.editor.dev.x86_64.llvm.san
168-
godot-args: -- --disallow-focus
169168
rust-toolchain: nightly
170169
rust-env-rustflags: -Zrandomize-layout -Zsanitizer=address
171170
rust-extra-args: --features godot/custom-godot
@@ -176,7 +175,6 @@ jobs:
176175
os: ubuntu-20.04
177176
artifact-name: linux-memcheck-clang-4.0.4
178177
godot-binary: godot.linuxbsd.editor.dev.x86_64.llvm.san
179-
godot-args: -- --disallow-focus
180178
godot-prebuilt-patch: '4.0.4'
181179
rust-toolchain: nightly
182180
rust-env-rustflags: -Zrandomize-layout -Zsanitizer=address
@@ -191,7 +189,7 @@ jobs:
191189
with:
192190
artifact-name: godot-${{ matrix.artifact-name }}
193191
godot-binary: ${{ matrix.godot-binary }}
194-
godot-args: ${{ matrix.godot-args }}
192+
godot-args: ${{ matrix.godot-args }} # currently unused
195193
godot-prebuilt-patch: ${{ matrix.godot-prebuilt-patch }}
196194
rust-extra-args: ${{ matrix.rust-extra-args }}
197195
rust-toolchain: ${{ matrix.rust-toolchain || 'stable' }}

0 commit comments

Comments
 (0)