update presets for mac and open editor for all three

LayerTwo-Labs · Jan 14, 2025 · dbc9637 · dbc9637
1 parent 6639201
commit dbc9637
Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -184,9 +184,13 @@ jobs:
 
       - name: Export build (Unix)
         if: matrix.build != 'windows'
+        shell: bash
         run: |
           name="${{fromJSON('{"windows": "Windows", "macos": "Mac", "linux": "Linux"}')[matrix.build] }}"
-          godot --path "./cusf_launcher/" --headless --export-release "$name" "${{ matrix.target-bin }}" --verbose 2>&1 | tee build.log
+          # Create build directory for macOS or Linux
+          mkdir -p "cusf_launcher/build/${{ matrix.build }}"
+          # For macOS, place final .dmg in that build folder
+          godot --path "./cusf_launcher/" --headless --export-release "$name" "cusf_launcher/build/${{ matrix.build }}/${{ 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
@@ -209,21 +213,22 @@ jobs:
         with:
           name: cusf_launcher_linux
           if-no-files-found: error
-          path: cusf_launcher/${{ matrix.target-bin }}
+          path: cusf_launcher/build/linux/cusf_launcher.x86_64
 
       - 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/${{ matrix.target-bin }}
+          path: cusf_launcher/build/macos/cusf_launcher.dmg
 
       - name: Wait for notarization to finish
         if: ${{ matrix.build == 'macos' }}
         run: |
+          # Extract the request UUID from build.log
           request_id=$(grep 'Notarization request UUID' build.log | rev | cut -d ' ' -f 1 | rev | tr -d '"')
           xcrun notarytool wait $request_id \
             --issuer ${{ secrets.GODOT_MACOS_NOTARIZATION_API_UUID }} \
             --key-id ${{ secrets.GODOT_MACOS_NOTARIZATION_API_KEY_ID }} \
-            --key ./cusf_launcher/notarization_api_key.p8
+            --key ./cusf_launcher/notarization_api_key.p8
diff --git a/cusf_launcher/export_presets.cfg b/cusf_launcher/export_presets.cfg
@@ -49,7 +49,7 @@ custom_features=""
 export_filter="all_resources"
 include_filter="addons/*"
 exclude_filter=""
-export_path=""
+export_path="res://build/macos/cusf_launcher.dmg"
 encryption_include_filters=""
 encryption_exclude_filters=""
 encrypt_pck=false
@@ -58,7 +58,7 @@ script_export_mode=2
 
 [preset.1.options]
 
-export/distribution_type=1
+export/distribution_type=2
 binary_format/architecture="universal"
 custom_template/debug=""
 custom_template/release=""