Skip to content

Commit 082185b

Browse files
authored
Try #910:
2 parents cb2a30f + 84f6f97 commit 082185b

File tree

600 files changed

+22302
-3833
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

600 files changed

+22302
-3833
lines changed

.github/composite/godot/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ runs:
6868
if grep -q "Leaked instance" "${{ runner.temp }}/stdout.log"; then
6969
exit 1;
7070
fi;
71-
cargo build --features type-tag-fallback;
71+
cargo build --features type-tag-fallback ${{ inputs.rust_extra_args }}
7272
mkdir -p ./project/lib;
7373
cp ../target/debug/libgdnative_test.so ./project/lib/;
7474
${GODOT_BIN} --path ./project/ > >(tee "${{ runner.temp }}/stdout.log");

.github/workflows/full-ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -276,13 +276,13 @@ jobs:
276276
include:
277277
# Latest Godot with different Rust versions
278278
- rust: stable
279-
godot: "3.4.3"
279+
godot: "3.5.1-rc1"
280280
postfix: ''
281281
- rust: nightly
282-
godot: "3.4.3"
282+
godot: "3.5.1-rc1"
283283
postfix: ' (nightly)'
284284
- rust: '1.56'
285-
godot: "3.4.3"
285+
godot: "3.5.1-rc1"
286286
postfix: ' (msrv 1.56)'
287287

288288
# Test with oldest supported engine version

check.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ function findGodot() {
4646
# Special case for Windows when there is a .bat file
4747
# Also consider that 'cmd /c' would need 'cmd //c' (https://stackoverflow.com/q/21357813)
4848
elif
49-
# Don't ask me why Godot returns 255 instead of 0
49+
# Godot returns 255 for older versions, but 0 for newer ones
5050
godot.bat --version
51-
[ $? -eq 255 ]
51+
[[ $? -eq 255 || $? -eq 0 ]]
5252
then
5353
echo "Found 'godot.bat' script"
5454
godotBin="godot.bat"

0 commit comments

Comments
 (0)