Skip to content

Commit

Permalink
Merge pull request #1050 from godot-rust/qol/gdscript-uids
Browse files Browse the repository at this point in the history
Add .uid files for GDScript + GDExtension resources; update script cache
  • Loading branch information
Bromeon authored Feb 16, 2025
2 parents b2bff88 + a8fccb3 commit 80c24f6
Show file tree
Hide file tree
Showing 13 changed files with 30 additions and 14 deletions.
17 changes: 11 additions & 6 deletions .github/composite/godot-itest/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ runs:
# * tee: still output logs while scanning for errors
# * grep -q: no output, use exit code 0 if found -> thus also &&
# * pkill: stop Godot execution (since it hangs in headless mode); simple 'head -1' did not work as expected
# since it's not available on Windows, use taskkill in that case.
# * exit: the terminated process would return 143, but this is more explicit and future-proof
#
# --disallow-focus: fail if #[itest(focus)] is encountered, to prevent running only a few tests for full CI
Expand All @@ -166,10 +167,14 @@ runs:
$GODOT4_BIN --headless -- --disallow-focus ${{ inputs.godot-args }} 2>&1 \
| tee "${{ runner.temp }}/log.txt" \
| tee >(grep -E "SCRIPT ERROR:|Can't open dynamic library" -q && {
printf "\n::error::godot-itest: unrecoverable Godot error, abort...\n";
pkill godot
echo "OUTCOME=godot-runtime" >> $GITHUB_ENV
exit 2
printf "\n::error::godot-itest: unrecoverable Godot error, abort...\n";
if [[ "$RUNNER_OS" == "Windows" ]]; then
taskkill -f -im godot*
else
pkill godot
fi
echo "OUTCOME=godot-runtime" >> $GITHUB_ENV
exit 2
})
echo "OUTCOME=success" >> $GITHUB_ENV
Expand Down Expand Up @@ -198,14 +203,14 @@ runs:
"godot-runtime")
echo "### :x: Godot runtime error" > $GITHUB_STEP_SUMMARY
echo "$GODOT_BUILT_FROM" >> $GITHUB_STEP_SUMMARY
echo "Aborted due to an error during Godot execution." >> $GITHUB_STEP_SUMMARY
echo "Aborted due to an error during Godot execution." >> $GITHUB_STEP_SUMMARY
exit 2
;;
"godot-leak")
echo "### :x: Memory leak" > $GITHUB_STEP_SUMMARY
echo "$GODOT_BUILT_FROM" >> $GITHUB_STEP_SUMMARY
echo "Integration tests cause memory leaks." >> $GITHUB_STEP_SUMMARY
echo "Integration tests cause memory leaks." >> $GITHUB_STEP_SUMMARY
exit 3
;;
Expand Down
1 change: 1 addition & 0 deletions examples/hot-reload/godot/rust.gdextension.uid
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
uid://bm60he8dcrowk
1 change: 1 addition & 0 deletions examples/hot-reload/godot/test/ReloadOrchestrator.gd.uid
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
uid://buwkqqupj5r3o
1 change: 1 addition & 0 deletions examples/hot-reload/godot/test/ReloadTest.gd.uid
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
uid://bsfhdl1665yjl
16 changes: 8 additions & 8 deletions itest/godot/.godot/global_script_class_cache.cfg
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
list=Array[Dictionary]([{
list=[{
"base": &"Node",
"class": &"GDScriptTestRunner",
"icon": "",
"is_abstract": false,
"is_tool": true,
"language": &"GDScript",
"path": "res://TestRunner.gd"
}, {
"base": &"RefCounted",
"class": &"TestStats",
"icon": "",
"language": &"GDScript",
"path": "res://TestStats.gd"
}, {
"base": &"RefCounted",
"class": &"TestSuite",
"icon": "",
"is_abstract": false,
"is_tool": false,
"language": &"GDScript",
"path": "res://TestSuite.gd"
}, {
"base": &"TestSuite",
"class": &"TestSuiteSpecial",
"icon": "",
"is_abstract": false,
"is_tool": false,
"language": &"GDScript",
"path": "res://TestSuiteSpecial.gd"
}])
}]
1 change: 1 addition & 0 deletions itest/godot/InheritTests.gd.uid
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
uid://11yajm7pqhey
1 change: 1 addition & 0 deletions itest/godot/ManualFfiTests.gd.uid
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
uid://c4r3oh2k4pfpe
1 change: 1 addition & 0 deletions itest/godot/ScriptInstanceTests.gd.uid
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
uid://5xi1qa5btlen
1 change: 1 addition & 0 deletions itest/godot/SpecialTests.gd.uid
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
uid://cj2c8t8bb8r5k
1 change: 1 addition & 0 deletions itest/godot/TestRunner.gd.uid
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
uid://dcsm6ho05dipr
1 change: 1 addition & 0 deletions itest/godot/TestSuite.gd.uid
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
uid://cjnex6snpwbsl
1 change: 1 addition & 0 deletions itest/godot/TestSuiteSpecial.gd.uid
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
uid://cj4h847dxex0f
1 change: 1 addition & 0 deletions itest/godot/itest.gdextension.uid
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
uid://c6fukwfyre1x5

0 comments on commit 80c24f6

Please sign in to comment.