From 7a8d3ab6f2bb9d6ee03b903b58fbecd84ffa5490 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Maquin?= Date: Thu, 25 Jan 2024 19:57:47 -0500 Subject: [PATCH] Re-enable C# CI job --- .github/workflows/continuous-integration.yml | 48 ++++++++++---------- .gut_editor_config.json | 4 +- addons/inkgd/runtime/lists/ink_list.gd | 4 +- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index b7115e1..a6a4af6 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -19,7 +19,7 @@ jobs: strategy: matrix: destination: - - "4.2" + - "4.2.1" steps: - name: "(Shared) Check out the repository" @@ -60,29 +60,29 @@ jobs: run: | ./godot --headless -d -s --path "inkgd" "addons/gut/gut_cmdln.gd" - # - name: "(Mono) Install Godot" - # env: - # VERSION: ${{ matrix.destination }} - # run: | - # wget -q https://downloads.tuxfamily.org/godotengine/${VERSION}/mono/Godot_v${VERSION}-stable_mono_linux_headless_64.zip - # unzip Godot_v${VERSION}-stable_mono_linux_headless_64.zip - # mv Godot_v${VERSION}-stable_mono_linux_headless_64 godot_mono - # mv godot_mono/Godot_v${VERSION}-stable_mono_linux_headless.64 godot_mono/godot_mono - # chmod +x godot_mono/godot_mono + - name: "(Mono) Install Godot" + env: + VERSION: ${{ matrix.destination }} + run: | + wget -q https://downloads.tuxfamily.org/godotengine/${VERSION}/mono/Godot_v${VERSION}-stable_mono_linux_headless_64.zip + unzip Godot_v${VERSION}-stable_mono_linux_headless_64.zip + mv Godot_v${VERSION}-stable_mono_linux_headless_64 godot_mono + mv godot_mono/Godot_v${VERSION}-stable_mono_linux_headless.64 godot_mono/godot_mono + chmod +x godot_mono/godot_mono - # - name: "(Mono) Install Ink Runtime" - # run: | - # wget -q https://github.com/inkle/ink/releases/download/v1.1.0/inklecate_windows.zip - # unzip inklecate_windows.zip - # mv ink-engine-runtime.dll inkgd/addons/inkgd/mono/assemblies/ink-engine-runtime.dll + - name: "(Mono) Install Ink Runtime" + run: | + wget -q https://github.com/inkle/ink/releases/download/v1.1.0/inklecate_windows.zip + unzip inklecate_windows.zip + mv ink-engine-runtime.dll inkgd/addons/inkgd/mono/assemblies/ink-engine-runtime.dll - # - name: "(Mono) Compile C# solution" - # run: | - # ./godot_mono/godot_mono --headless --quit --path "inkgd" - # cd inkgd - # msbuild inkgd.sln /restore /t:Build /p:Configuration=Debug - # cd .. + - name: "(Mono) Compile C# solution" + run: | + ./godot_mono/godot_mono --headless --quit --path "inkgd" + cd inkgd + msbuild inkgd.sln /restore /t:Build /p:Configuration=Debug + cd .. - # - name: "(Mono) Run tests (Mono)" - # run: | - # ./godot_mono/godot_mono --headless -d -s --path "inkgd" "addons/gut/gut_cmdln.gd" + - name: "(Mono) Run tests (Mono)" + run: | + ./godot_mono/godot_mono --headless -d -s --path "inkgd" "addons/gut/gut_cmdln.gd" diff --git a/.gut_editor_config.json b/.gut_editor_config.json index 3a8afef..33720ce 100644 --- a/.gut_editor_config.json +++ b/.gut_editor_config.json @@ -36,12 +36,12 @@ "post_run_script": "", "pre_run_script": "", "prefix": "test_", - "selected": "test_variables.gd", + "selected": null, "should_exit": true, "should_exit_on_success": true, "should_maximize": false, "show_help": false, "suffix": ".gd", "tests": [], - "unit_test_name": "test_observe_variables" + "unit_test_name": null } \ No newline at end of file diff --git a/addons/inkgd/runtime/lists/ink_list.gd b/addons/inkgd/runtime/lists/ink_list.gd index 2f91812..2270561 100644 --- a/addons/inkgd/runtime/lists/ink_list.gd +++ b/addons/inkgd/runtime/lists/ink_list.gd @@ -169,7 +169,7 @@ func set_initial_origin_names(initial_origin_names) -> void: # TODO: Make inspectable var max_item: InkKeyValuePair: # InkKeyValuePair get: - var _max_item: InkKeyValuePair = InkKeyValuePair.new_with_key_value(InkListItem.null_item, 0) + var _max_item: InkKeyValuePair = InkKeyValuePair.new_with_key_value(InkListItem.null_item(), 0) for k in keys(): if (_max_item.key.is_null || get_item(k) > _max_item.value): _max_item = InkKeyValuePair.new_with_key_value(k, get_item(k)) @@ -180,7 +180,7 @@ var max_item: InkKeyValuePair: # InkKeyValuePair # TODO: Make inspectable var min_item: InkKeyValuePair: # InkKeyValuePair get: - var _min_item: InkKeyValuePair = InkKeyValuePair.new_with_key_value(InkListItem.null_item, 0) + var _min_item: InkKeyValuePair = InkKeyValuePair.new_with_key_value(InkListItem.null_item(), 0) for k in keys(): if (_min_item.key.is_null || get_item(k) < _min_item.value): _min_item = InkKeyValuePair.new_with_key_value(k, get_item(k))