From 88643852262119043c06f7967770bc94abdad55d Mon Sep 17 00:00:00 2001 From: Nullpointer Date: Mon, 9 Dec 2024 11:47:05 +0100 Subject: [PATCH] Update ci-pr to dev6 (#610) # Why a new dev version is out, and we need to run against to ensure nothing is broken --- .github/workflows/ci-pr-publish-report.yml | 2 +- .github/workflows/ci-pr.yml | 2 +- .../src/ui/menu/EditorFileSystemContextMenuHandler.gd | 10 ++++------ addons/gdUnit4/test/core/GdArrayToolsTest.gd | 2 +- .../test/core/parse/GdDefaultValueDecoderTest.gd | 7 ++++--- project.godot | 2 +- 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci-pr-publish-report.yml b/.github/workflows/ci-pr-publish-report.yml index 886bbac8..df5fd830 100644 --- a/.github/workflows/ci-pr-publish-report.yml +++ b/.github/workflows/ci-pr-publish-report.yml @@ -28,7 +28,7 @@ jobs: godot-net: ['-net', ''] include: - godot-version: '4.4' - godot-status: 'dev5' + godot-status: 'dev6' steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml index 8cee47da..8c2fc2d6 100644 --- a/.github/workflows/ci-pr.yml +++ b/.github/workflows/ci-pr.yml @@ -35,7 +35,7 @@ jobs: godot-net: ['.Net', ''] include: - godot-version: '4.4' - godot-status: 'dev5' + godot-status: 'dev6' permissions: actions: write diff --git a/addons/gdUnit4/src/ui/menu/EditorFileSystemContextMenuHandler.gd b/addons/gdUnit4/src/ui/menu/EditorFileSystemContextMenuHandler.gd index 9c58a209..29e7d620 100644 --- a/addons/gdUnit4/src/ui/menu/EditorFileSystemContextMenuHandler.gd +++ b/addons/gdUnit4/src/ui/menu/EditorFileSystemContextMenuHandler.gd @@ -32,7 +32,6 @@ func on_context_menu_show(context_menu: PopupMenu, file_tree: Tree) -> void: func on_context_menu_pressed(id: int, file_tree: Tree) -> void: - #prints("on_context_menu_pressed", id) if !_context_menus.has(id): return var menu_item: GdUnitContextMenuItem = _context_menus[id] @@ -54,11 +53,10 @@ func collect_testsuites(_menu_item: GdUnitContextMenuItem, file_tree: Tree) -> P selected_test_suites.append(resource_path) elif is_dir or file_type == "GDScript" or file_type == "CSharpScript": # find a performant way to check if the selected item a testsuite - #var resource := ResourceLoader.load(resource_path, "GDScript", ResourceLoader.CACHE_MODE_REUSE) - #prints("loaded", resource) - #if resource is GDScript and menu_item.is_visible(resource): - @warning_ignore("return_value_discarded") - selected_test_suites.append(resource_path) + var resource := ResourceLoader.load(resource_path, "Script", ResourceLoader.CACHE_MODE_REUSE) + if _menu_item.is_visible(resource): + @warning_ignore("return_value_discarded") + selected_test_suites.append(resource_path) selected_item = file_tree.get_next_selected(selected_item) return selected_test_suites diff --git a/addons/gdUnit4/test/core/GdArrayToolsTest.gd b/addons/gdUnit4/test/core/GdArrayToolsTest.gd index e06ed6c9..e76f50c3 100644 --- a/addons/gdUnit4/test/core/GdArrayToolsTest.gd +++ b/addons/gdUnit4/test/core/GdArrayToolsTest.gd @@ -25,7 +25,7 @@ func test_as_string(_test :String, value :Variant, expected :String, test_parame ['ArrayVector2i', Array([Vector2i.ZERO, Vector2i.LEFT]) as Array[Vector2i], '[Vector2i(), Vector2i'+str(Vector2i(-1, 0))+']'], ['ArrayVector3', Array([Vector3.ZERO, Vector3.LEFT]) as Array[Vector3], '[Vector3(), Vector3'+str(Vector3(-1, 0, 0))+']'], ['ArrayVector3i', Array([Vector3i.ZERO, Vector3i.LEFT]) as Array[Vector3i], '[Vector3i(), Vector3i'+str(Vector3i(-1, 0, 0))+']'], - ['ArrayVector4', Array([Vector4.ZERO, Vector4.ONE]) as Array[Vector4], '[Vector4(), Vector4(1, 1, 1, 1)]'], + ['ArrayVector4', Array([Vector4.ZERO, Vector4.ONE]) as Array[Vector4], '[Vector4(), Vector4%s]' % Vector4(1, 1, 1, 1)], ['ArrayVector4i', Array([Vector4i.ZERO, Vector4i.ONE]) as Array[Vector4i], '[Vector4i(), Vector4i(1, 1, 1, 1)]'], ['ArrayColor', Array([Color.RED, Color.GREEN]) as Array[Color], '[Color'+str(Color(1, 0, 0, 1))+', Color'+str(Color(0, 1, 0, 1))+']'], ['PackedByteArray', PackedByteArray([1, 2]), 'PackedByteArray[1, 2]'], diff --git a/addons/gdUnit4/test/core/parse/GdDefaultValueDecoderTest.gd b/addons/gdUnit4/test/core/parse/GdDefaultValueDecoderTest.gd index d6660d5a..8d6a12ec 100644 --- a/addons/gdUnit4/test/core/parse/GdDefaultValueDecoderTest.gd +++ b/addons/gdUnit4/test/core/parse/GdDefaultValueDecoderTest.gd @@ -93,10 +93,11 @@ func test_decode_Transforms(variant_type :int, value :Variant, expected :String, [TYPE_TRANSFORM3D, Transform3D(Vector3(1,2,3), Vector3(4,5,6), Vector3(7,8,9), Vector3.ONE), "Transform3D(Vector3"+str(Vector3(1, 2, 3))+", Vector3"+str(Vector3(4, 5, 6)) +", Vector3"+str(Vector3(7, 8, 9))+", Vector3"+str(Vector3(1, 1, 1))+")"], - [TYPE_PROJECTION, Projection(), - "Projection(Vector4(1, 0, 0, 0), Vector4(0, 1, 0, 0), Vector4(0, 0, 1, 0), Vector4(0, 0, 0, 1))"], + [TYPE_PROJECTION, Projection(), "Projection(Vector4%s, Vector4%s, Vector4%s, Vector4%s)" + % [Vector4(1, 0, 0, 0), Vector4(0, 1, 0, 0), Vector4(0, 0, 1, 0), Vector4(0, 0, 0, 1)]], [TYPE_PROJECTION, Projection(Vector4.ONE, Vector4.ONE*2, Vector4.ONE*3, Vector4.ZERO), - "Projection(Vector4(1, 1, 1, 1), Vector4(2, 2, 2, 2), Vector4(3, 3, 3, 3), Vector4(0, 0, 0, 0))"] + "Projection(Vector4%s, Vector4%s, Vector4%s, Vector4%s)" % + [Vector4.ONE, Vector4.ONE*2, Vector4.ONE*3, Vector4.ZERO]] ]) -> void: assert_that(GdDefaultValueDecoder.decode_typed(variant_type, value)).is_equal(expected) _tested_types[variant_type] = 1 diff --git a/project.godot b/project.godot index 69b226ae..b7aa5702 100644 --- a/project.godot +++ b/project.godot @@ -12,7 +12,7 @@ config_version=5 config/name="gdUnit4" config/tags=PackedStringArray("addon", "godot4", "testing") -config/features=PackedStringArray("4.3", "C#") +config/features=PackedStringArray("4.4", "C#") config/icon="res://icon.png" [audio]