Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
85 changes: 0 additions & 85 deletions .github/workflows/assemble_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ on:
type: string
build-version:
type: string
build-test-templates:
type: boolean
default: true

concurrency:
group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-macos_assemble
Expand Down Expand Up @@ -187,85 +184,3 @@ jobs:
with:
name: export_template_all_macos
path: export_template_all_macos.zip

create-macos-test-export-template-universal:
if: ${{ inputs.build-test-templates }}
runs-on: macos-latest
name: ${{ matrix.name }}
strategy:
fail-fast: false
matrix:
include:
- name: Create test export template universal binary release
target: release

- name: Create test export template universal binary debug
target: debug
steps:
- name: Clone Godot JVM module.
uses: actions/checkout@v4

- name: Download ${{ matrix.target }} x86_64 test export_template
uses: actions/download-artifact@v4
with:
name: export_template_test_${{ matrix.target }}_macos_x86_64
path: "./"

- name: Download ${{ matrix.target }} arm64 test export_template
uses: actions/download-artifact@v4
with:
name: export_template_test_${{ matrix.target }}_macos_arm64
path: "./"

- name: Create macos universal binary
uses: ./.github/actions/create-macos-universal-binary
with:
amd-64-binary: godot.macos.template_${{ matrix.target }}.x86_64.jvm.${{ inputs.build-version }}
arm-64-binary: godot.macos.template_${{ matrix.target }}.arm64.jvm.${{ inputs.build-version }}
universal-output-binary: godot.macos.template_${{ matrix.target }}.universal

- name: Upload ${{ matrix.target }} macos test universal artifact
uses: actions/upload-artifact@v4
with:
name: export_template_test_${{ matrix.target }}_macos_universal
path: godot.macos.template_${{ matrix.target }}.universal

create-macos-test-export-template-app:
if: ${{ inputs.build-test-templates }}
needs: [ create-macos-test-export-template-universal ]
runs-on: macos-latest
name: Create macos test export template app
steps:
- name: Clone Godot Engine
uses: actions/checkout@v4
with:
repository: godotengine/godot
ref: ${{ inputs.godot-version }}

- name: Download debug test export_template
uses: actions/download-artifact@v4
with:
name: export_template_test_debug_macos_universal
path: .

- name: Download release test export_template
uses: actions/download-artifact@v4
with:
name: export_template_test_release_macos_universal
path: .

- name: Create MacOs test template app
run: |
cp -r misc/dist/macos_template.app .
mkdir -p macos_template.app/Contents/MacOS
cp godot.macos.template_release.universal macos_template.app/Contents/MacOS/godot_macos_release.universal
cp godot.macos.template_debug.universal macos_template.app/Contents/MacOS/godot_macos_debug.universal
chmod +x macos_template.app/Contents/MacOS/godot_macos*
zip -q -9 -r export_template_test_all_macos.zip macos_template.app
shell: bash

- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: export_template_test_all_macos
path: export_template_test_all_macos.zip
9 changes: 0 additions & 9 deletions .github/workflows/build_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ on:
inputs:
godot-version:
type: string
build-test-templates:
type: boolean
default: true

concurrency:
group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-linux_build
Expand All @@ -27,12 +24,6 @@ jobs:
{"name":"Build release template x86_64","cache-name":"export_template_release_linux_x86_64","target":"template_release","scons-flags":""},
{"name":"Build debug template x86_64","cache-name":"export_template_debug_linux_x86_64","target":"template_debug","scons-flags":""}
]}'
if [ "${{ inputs.build-test-templates }}" == "true" ]; then
MATRIX=$(echo "$MATRIX" | jq -c '.include += [
{"name":"Build release template x86_64 (test)","cache-name":"export_template_test_release_linux_x86_64","target":"template_release","scons-flags":"disable_path_overrides=no"},
{"name":"Build debug template x86_64 (test)","cache-name":"export_template_test_debug_linux_x86_64","target":"template_debug","scons-flags":"disable_path_overrides=no"}
]')
fi
echo "matrix=$(echo $MATRIX | jq -c '.')" >> $GITHUB_OUTPUT

build-linux:
Expand Down
11 changes: 0 additions & 11 deletions .github/workflows/build_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ on:
inputs:
godot-version:
type: string
build-test-templates:
type: boolean
default: true

concurrency:
group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-macos_build
Expand All @@ -32,14 +29,6 @@ jobs:
{"name":"Build release template arm64","cache-name":"export_template_release_macos_arm64","target":"template_release","scons-flags":"arch=arm64"},
{"name":"Build debug template arm64","cache-name":"export_template_debug_macos_arm64","target":"template_debug","scons-flags":"arch=arm64"}
]}'
if [ "${{ inputs.build-test-templates }}" == "true" ]; then
MATRIX=$(echo "$MATRIX" | jq -c '.include += [
{"name":"Build release template x86_64 (test)","cache-name":"export_template_test_release_macos_x86_64","target":"template_release","scons-flags":"arch=x86_64 disable_path_overrides=no"},
{"name":"Build debug template x86_64 (test)","cache-name":"export_template_test_debug_macos_x86_64","target":"template_debug","scons-flags":"arch=x86_64 disable_path_overrides=no"},
{"name":"Build release template arm64 (test)","cache-name":"export_template_test_release_macos_arm64","target":"template_release","scons-flags":"arch=arm64 disable_path_overrides=no"},
{"name":"Build debug template arm64 (test)","cache-name":"export_template_test_debug_macos_arm64","target":"template_debug","scons-flags":"arch=arm64 disable_path_overrides=no"}
]')
fi
echo "matrix=$(echo $MATRIX | jq -c '.')" >> $GITHUB_OUTPUT

build-macos:
Expand Down
9 changes: 0 additions & 9 deletions .github/workflows/build_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ on:
inputs:
godot-version:
type: string
build-test-templates:
type: boolean
default: true

env:
SCONS_CACHE_MSVC_CONFIG: true
Expand All @@ -30,12 +27,6 @@ jobs:
{"name":"Build release template","cache-name":"export_template_release_windows_x86_64","target":"template_release","should-clean":true,"scons-flags":""},
{"name":"Build debug template","cache-name":"export_template_debug_windows_x86_64","target":"template_debug","should-clean":false,"scons-flags":""}
]}'
if [ "${{ inputs.build-test-templates }}" == "true" ]; then
MATRIX=$(echo "$MATRIX" | jq -c '.include += [
{"name":"Build release template (test)","cache-name":"export_template_test_release_windows_x86_64","target":"template_release","should-clean":true,"scons-flags":"disable_path_overrides=no"},
{"name":"Build debug template (test)","cache-name":"export_template_test_debug_windows_x86_64","target":"template_debug","should-clean":false,"scons-flags":"disable_path_overrides=no"}
]')
fi
echo "matrix=$(echo $MATRIX | jq -c '.')" >> $GITHUB_OUTPUT

build-windows:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,5 @@ jobs:
cd harness/tests/
chmod +x bin/godot.*
jlink --add-modules java.base,java.logging --output jvm/jre-amd64-linux
./gradlew runGutTests
./gradlew runGDTests
timeout-minutes: 30
4 changes: 2 additions & 2 deletions .github/workflows/test_linux_exports.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
- name: Download linux x86_64 ${{ matrix.jvm-target }} export template
uses: actions/download-artifact@v4
with:
name: export_template_test_${{ matrix.jvm-target }}_linux_x86_64
name: export_template_${{ matrix.jvm-target }}_linux_x86_64
path: "./"

- name: Prepare export
Expand Down Expand Up @@ -87,5 +87,5 @@ jobs:
- name: Run Tests
run: |
cd harness/tests/
./gradlew runExportedGutTests
./gradlew runExportedGDTests
timeout-minutes: 30
2 changes: 1 addition & 1 deletion .github/workflows/test_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,5 @@ jobs:
cd harness/tests/
chmod +x bin/godot.*
jlink --add-modules java.base,java.logging --output jvm/jre-arm64-macos
./gradlew runGutTests
./gradlew runGDTests
timeout-minutes: 30
6 changes: 3 additions & 3 deletions .github/workflows/test_macos_exports.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,14 @@ jobs:
- name: Download macos export template
uses: actions/download-artifact@v4
with:
name: export_template_test_all_macos
name: export_template_all_macos
path: "./"

- name: Prepare export
run: |
chmod +x harness/tests/bin/godot.*
mkdir -p harness/tests/export
mv export_template_test_all_macos.zip harness/tests/export_template_all_macos.zip
mv export_template_all_macos.zip harness/tests/export_template_all_macos.zip

- name: Build tests project
run: |
Expand Down Expand Up @@ -95,5 +95,5 @@ jobs:
- name: Run Tests
run: |
cd harness/tests/
./gradlew runExportedGutTests
./gradlew runExportedGDTests
timeout-minutes: 30
2 changes: 1 addition & 1 deletion .github/workflows/test_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,5 @@ jobs:
run: |
cd harness/tests/
jlink --add-modules java.base,java.logging --output jvm/jre-amd64-windows
./gradlew runGutTests
./gradlew runGDTests
timeout-minutes: 30
5 changes: 3 additions & 2 deletions .github/workflows/test_windows_exports.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,14 @@ jobs:
- name: Download windows x86_64 ${{ matrix.jvm-target }} export template
uses: actions/download-artifact@v4
with:
name: export_template_test_${{ matrix.jvm-target }}_windows_x86_64
name: export_template_${{ matrix.jvm-target }}_windows_x86_64
path: "./"

- name: Prepare export
run: |
mkdir -p harness/tests/export
mv godot.windows.template_${{ matrix.jvm-target }}.x86_64.jvm.${{ inputs.build-version }}.exe harness/tests/godot.windows.template_${{ matrix.jvm-target }}.x86_64.exe
mv godot.windows.template_${{ matrix.jvm-target }}.x86_64.jvm.${{ inputs.build-version }}.console.exe harness/tests/godot.windows.template_${{ matrix.jvm-target }}.x86_64.console.exe

- name: Build tests project
run: |
Expand Down Expand Up @@ -86,5 +87,5 @@ jobs:
- name: Run Tests
run: |
cd harness/tests/
./gradlew runExportedGutTests
./gradlew runExportedGDTests
timeout-minutes: 30
4 changes: 0 additions & 4 deletions .github/workflows/trigger_on_tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ jobs:
- setup-build-variables
with:
godot-version: ${{ needs.setup-build-variables.outputs['godot-version'] }}
build-test-templates: false

build-macos:
name: 🍎 Build macOS
Expand All @@ -74,7 +73,6 @@ jobs:
- setup-build-variables
with:
godot-version: ${{ needs.setup-build-variables.outputs['godot-version'] }}
build-test-templates: false

build-windows:
name: 🪟 Build Windows
Expand All @@ -83,7 +81,6 @@ jobs:
- setup-build-variables
with:
godot-version: ${{ needs.setup-build-variables.outputs['godot-version'] }}
build-test-templates: false

assemble-android:
name: 🤖 Assemble android
Expand All @@ -106,7 +103,6 @@ jobs:
godot-kotlin-jvm-version: ${{ needs.setup-build-variables.outputs['godot-kotlin-jvm-version'] }}
godot-version: ${{ needs.setup-build-variables.outputs['godot-version'] }}
build-version: ${{ needs.setup-build-variables.outputs['build-version'] }}
build-test-templates: false

assemble-ios:
name: 🍏 Assemble ios
Expand Down
1 change: 1 addition & 0 deletions harness/tests/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ graal/godot-kotlin-graal-jni-config.json
/.godot/
/test_output.txt
/jvm/
/reports
36 changes: 0 additions & 36 deletions harness/tests/.gutconfig.json

This file was deleted.

29 changes: 6 additions & 23 deletions harness/tests/Spatial.tscn
Original file line number Diff line number Diff line change
@@ -1,35 +1,18 @@
[gd_scene load_steps=7 format=3 uid="uid://cnqp52df0ln8e"]
[gd_scene format=3 uid="uid://cnqp52df0ln8e"]

[ext_resource type="Script" uid="uid://dtjsjsnpovihy" path="res://scripts/godot/tests/Invocation.gdj" id="1"]
[ext_resource type="Script" uid="uid://c8hudoddexy5h" path="res://scripts/godot/tests/registration/KotlinExport.gdj" id="1"]

[sub_resource type="NavigationMesh" id="NavigationMesh_1ex3u"]

[sub_resource type="NavigationMesh" id="NavigationMesh_q3pqa"]

[sub_resource type="NavigationMesh" id="NavigationMesh_hn8kg"]

[sub_resource type="NavigationMesh" id="NavigationMesh_87cay"]

[sub_resource type="NavigationMesh" id="NavigationMesh_b12lh"]

[node name="Spatial" type="Node3D" node_paths=PackedStringArray("button")]
[node name="Spatial" type="Node3D" unique_id=1901248194 node_paths=PackedStringArray("button")]
script = ExtResource("1")
button = NodePath("CanvasLayer/Button")
resource_test = SubResource("NavigationMesh_1ex3u")
jvm_id = 319061373
nav_meshes = Array[NavigationMesh]([SubResource("NavigationMesh_q3pqa")])
nullable_array = Array[NavigationMesh]([SubResource("NavigationMesh_hn8kg"), null])
nav_meshes_dictionary = {
"AwesomeNavmesh": SubResource("NavigationMesh_87cay")
}
nullable_dictionary = {
"notnull": SubResource("NavigationMesh_b12lh"),
"null": null
}

[node name="Camera" type="Camera3D" parent="."]
[node name="Camera" type="Camera3D" parent="." unique_id=1049929]
transform = Transform3D(1, 0, 0, 0, 0.974354, 0.225019, 0, -0.225019, 0.974354, 0, 1.2131, 2.47241)

[node name="CanvasLayer" type="CanvasLayer" parent="."]
[node name="CanvasLayer" type="CanvasLayer" parent="." unique_id=1657114739]

[node name="Button" type="Button" parent="CanvasLayer"]
[node name="Button" type="Button" parent="CanvasLayer" unique_id=577865751]
Loading
Loading