Skip to content

Commit 80c24f6

Browse files
authored
Merge pull request #1050 from godot-rust/qol/gdscript-uids
Add .uid files for GDScript + GDExtension resources; update script cache
2 parents b2bff88 + a8fccb3 commit 80c24f6

13 files changed

+30
-14
lines changed

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

+11-6
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ runs:
157157
# * tee: still output logs while scanning for errors
158158
# * grep -q: no output, use exit code 0 if found -> thus also &&
159159
# * pkill: stop Godot execution (since it hangs in headless mode); simple 'head -1' did not work as expected
160+
# since it's not available on Windows, use taskkill in that case.
160161
# * exit: the terminated process would return 143, but this is more explicit and future-proof
161162
#
162163
# --disallow-focus: fail if #[itest(focus)] is encountered, to prevent running only a few tests for full CI
@@ -166,10 +167,14 @@ runs:
166167
$GODOT4_BIN --headless -- --disallow-focus ${{ inputs.godot-args }} 2>&1 \
167168
| tee "${{ runner.temp }}/log.txt" \
168169
| tee >(grep -E "SCRIPT ERROR:|Can't open dynamic library" -q && {
169-
printf "\n::error::godot-itest: unrecoverable Godot error, abort...\n";
170-
pkill godot
171-
echo "OUTCOME=godot-runtime" >> $GITHUB_ENV
172-
exit 2
170+
printf "\n::error::godot-itest: unrecoverable Godot error, abort...\n";
171+
if [[ "$RUNNER_OS" == "Windows" ]]; then
172+
taskkill -f -im godot*
173+
else
174+
pkill godot
175+
fi
176+
echo "OUTCOME=godot-runtime" >> $GITHUB_ENV
177+
exit 2
173178
})
174179
175180
echo "OUTCOME=success" >> $GITHUB_ENV
@@ -198,14 +203,14 @@ runs:
198203
"godot-runtime")
199204
echo "### :x: Godot runtime error" > $GITHUB_STEP_SUMMARY
200205
echo "$GODOT_BUILT_FROM" >> $GITHUB_STEP_SUMMARY
201-
echo "Aborted due to an error during Godot execution." >> $GITHUB_STEP_SUMMARY
206+
echo "Aborted due to an error during Godot execution." >> $GITHUB_STEP_SUMMARY
202207
exit 2
203208
;;
204209
205210
"godot-leak")
206211
echo "### :x: Memory leak" > $GITHUB_STEP_SUMMARY
207212
echo "$GODOT_BUILT_FROM" >> $GITHUB_STEP_SUMMARY
208-
echo "Integration tests cause memory leaks." >> $GITHUB_STEP_SUMMARY
213+
echo "Integration tests cause memory leaks." >> $GITHUB_STEP_SUMMARY
209214
exit 3
210215
;;
211216
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
uid://bm60he8dcrowk
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
uid://buwkqqupj5r3o
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
uid://bsfhdl1665yjl
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
list=Array[Dictionary]([{
1+
list=[{
22
"base": &"Node",
33
"class": &"GDScriptTestRunner",
44
"icon": "",
5+
"is_abstract": false,
6+
"is_tool": true,
57
"language": &"GDScript",
68
"path": "res://TestRunner.gd"
79
}, {
810
"base": &"RefCounted",
9-
"class": &"TestStats",
10-
"icon": "",
11-
"language": &"GDScript",
12-
"path": "res://TestStats.gd"
13-
}, {
14-
"base": &"RefCounted",
1511
"class": &"TestSuite",
1612
"icon": "",
13+
"is_abstract": false,
14+
"is_tool": false,
1715
"language": &"GDScript",
1816
"path": "res://TestSuite.gd"
1917
}, {
2018
"base": &"TestSuite",
2119
"class": &"TestSuiteSpecial",
2220
"icon": "",
21+
"is_abstract": false,
22+
"is_tool": false,
2323
"language": &"GDScript",
2424
"path": "res://TestSuiteSpecial.gd"
25-
}])
25+
}]

itest/godot/InheritTests.gd.uid

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
uid://11yajm7pqhey

itest/godot/ManualFfiTests.gd.uid

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
uid://c4r3oh2k4pfpe
+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
uid://5xi1qa5btlen

itest/godot/SpecialTests.gd.uid

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
uid://cj2c8t8bb8r5k

itest/godot/TestRunner.gd.uid

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
uid://dcsm6ho05dipr

itest/godot/TestSuite.gd.uid

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
uid://cjnex6snpwbsl

itest/godot/TestSuiteSpecial.gd.uid

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
uid://cj4h847dxex0f

itest/godot/itest.gdextension.uid

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
uid://c6fukwfyre1x5

0 commit comments

Comments
 (0)