revert to working yml

LayerTwo-Labs · Jan 14, 2025 · de2d1b7 · de2d1b7
1 parent 1e12fda
commit de2d1b7
Showing 1 changed file with 9 additions and 14 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -149,22 +149,17 @@ jobs:
           Write-Host "Checking Godot path: $godotPath"
           if (Test-Path $godotPath) {
             Write-Host "Godot executable found"
-            # open editor first
-            & $godotPath --headless --editor --quit --path "./cusf_launcher/"
-            # Then run your existing cache script
             python3 .github/scripts/godot_ci_cache.py --godot "$godotPath"
           } else {
             Write-Host "Godot not found at $godotPath"
+            Write-Host "Contents of godot directory:"
+            Get-ChildItem "C:/Users/runneradmin/godot" -Recurse
             exit 1
           }
 
       - name: Initialize godot cache (Unix)
         if: matrix.build != 'windows'
-        run: |
-          # open editor first
-          godot --headless --editor --quit --path "./cusf_launcher/"
-          # Then run your existing cache script
-          python3 .github/scripts/godot_ci_cache.py
+        run: python3 .github/scripts/godot_ci_cache.py
 
       - name: Create Windows build dir
         if: matrix.build == 'windows'
@@ -183,17 +178,17 @@ jobs:
 
       - name: Export build (Unix)
         if: matrix.build != 'windows'
-        shell: bash
         run: |
           name="${{fromJSON('{"windows": "Windows", "macos": "Mac", "linux": "Linux"}')[matrix.build] }}"
-          # Create build directory for macOS or Linux
-          mkdir -p "cusf_launcher/build/${{ matrix.build }}"
-          godot --path "./cusf_launcher/" --headless --export-release "$name" "cusf_launcher/build/${{ matrix.build }}/${{ matrix.target-bin }}" --verbose 2>&1 | tee build.log
+          godot --path "./cusf_launcher/" --headless --export-release "$name" "${{ matrix.target-bin }}" --verbose 2>&1 | tee build.log
         env:
           GODOT_MACOS_NOTARIZATION_API_KEY_ID: ${{ secrets.GODOT_MACOS_NOTARIZATION_API_KEY_ID }}
           GODOT_MACOS_NOTARIZATION_API_KEY: ./notarization_api_key.p8
           GODOT_MACOS_NOTARIZATION_API_UUID: ${{ secrets.GODOT_MACOS_NOTARIZATION_API_UUID }}
 
+      #
+      # ---- Separate upload steps for each OS ----
+      #
       - name: Upload build (Windows)
         if: matrix.build == 'windows'
         uses: actions/upload-artifact@v4
@@ -208,15 +203,15 @@ jobs:
         with:
           name: cusf_launcher_linux
           if-no-files-found: error
-          path: cusf_launcher/build/linux/cusf_launcher.x86_64
+          path: cusf_launcher/${{ matrix.target-bin }}
 
       - name: Upload build (macOS)
         if: matrix.build == 'macos'
         uses: actions/upload-artifact@v4
         with:
           name: cusf_launcher_macos
           if-no-files-found: error
-          path: cusf_launcher/build/macos/cusf_launcher.dmg
+          path: cusf_launcher/${{ matrix.target-bin }}
 
       - name: Wait for notarization to finish
         if: ${{ matrix.build == 'macos' }}