yet another action

pkdawson · Jul 1, 2024 · a6c579e · a6c579e
1 parent a03a592
commit a6c579e
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 21 deletions.
diff --git a/.github/actions/import/action.yml b/.github/actions/import/action.yml
@@ -17,6 +17,5 @@ runs:
         godotenv addons install
         mkdir .godot
         echo "res://addons/imgui-godot/imgui-godot-native.gdextension" > .godot/extension_list.cfg
-        sleep 1
         $GODOT --headless --import || true
         echo "GAMEDIR=$(pwd)" >> $GITHUB_ENV
diff --git a/.github/actions/run-test-project/action.yml b/.github/actions/run-test-project/action.yml
@@ -0,0 +1,31 @@
+name: Run test project
+description: Run test project
+inputs:
+  exe:
+    description: Executable
+    required: true
+
+runs:
+  using: composite
+  steps:
+    - name: Run tests
+      shell: bash
+      run: |
+        cd $GAMEDIR
+        $GODOT --headless --debug
+
+    - name: Export debug
+      shell: bash
+      run: |
+        cd $GAMEDIR
+        $GODOT --headless --export-debug $RUNNER_OS
+        cd export
+        ./${{ inputs.exe }} --headless
+
+    - name: Export release
+      shell: bash
+      run: |
+        cd $GAMEDIR
+        $GODOT --headless --export-release $RUNNER_OS
+        cd export
+        ./${{ inputs.exe }} --headless
diff --git a/.github/workflows/gdext.yml b/.github/workflows/gdext.yml
@@ -372,6 +372,10 @@ jobs:
           - os: windows-latest
             name: 🪟Test
             test_exe: test.exe
+        exclude:
+          # frequently gets stuck on import despite workaround
+          - os: windows-latest
+            gdver: "4.2.2"
 
     name: ${{ matrix.name }} (${{ matrix.gdver }})
     runs-on: ${{ matrix.os }}
@@ -393,23 +397,6 @@ jobs:
           path: doc/test/gdscript
 
       - name: Run tests
-        shell: bash
-        run: |
-          cd $GAMEDIR
-          $GODOT --headless --debug
-
-      - name: Export debug
-        shell: bash
-        run: |
-          cd $GAMEDIR
-          $GODOT --headless --export-debug $RUNNER_OS
-          cd export
-          ./${{ matrix.test_exe }} --headless
-
-      - name: Export release
-        shell: bash
-        run: |
-          cd $GAMEDIR
-          $GODOT --headless --export-release $RUNNER_OS
-          cd export
-          ./${{ matrix.test_exe }} --headless
+        uses: ./.github/actions/run-test-project
+        with:
+          exe: ${{ matrix.test_exe }}