bak

Author: timzaak

.github/workflows/cd.yml

@@ -31,12 +31,54 @@ jobs:
 
       - name: package
         run: jpackage --name https-proxy --input target/universal/stage/lib --main-jar https-proxy.https-proxy-${{ inputs.version }}.jar --main-class Main --type app-image
-      - name: release
-        # 上传 https-proxy 目录
+      - name: Archive macOS app bundle
+        if: matrix.os == 'macos-latest'
+        run: |
+          EXPECTED_APP_DIR="https-proxy.app"
+          ARCHIVE_NAME="https-proxy-macos-${{ inputs.version }}.zip"
+          if [ -d "$EXPECTED_APP_DIR" ]; then
+            zip -r "$ARCHIVE_NAME" "$EXPECTED_APP_DIR"
+            echo "macOS artifact zipped to $ARCHIVE_NAME"
+          else
+            echo "Error: $EXPECTED_APP_DIR not found in current directory. Listing contents:"
+            ls -lah
+            # Attempt to find it if jpackage placed it inside 'https-proxy' folder
+            if [ -d "https-proxy/$EXPECTED_APP_DIR" ]; then
+                echo "Found $EXPECTED_APP_DIR inside 'https-proxy' directory. Zipping from there."
+                (cd https-proxy && zip -r "../$ARCHIVE_NAME" "$EXPECTED_APP_DIR")
+                echo "macOS artifact zipped to $ARCHIVE_NAME from https-proxy/$EXPECTED_APP_DIR"
+            else
+                echo "Still cannot find $EXPECTED_APP_DIR. Exiting."
+                exit 1
+            fi
+          fi
+
+      - name: Debug macOS jpackage output
+        if: matrix.os == 'macos-latest'
+        run: |
+          pwd
+          echo "--- Listing current directory ---"
+          ls -lah
+          echo "--- Listing target/universal/stage ---"
+          ls -lah target/universal/stage
+          echo "--- Listing expected jpackage output location (if it's a directory) ---"
+          ls -lah https-proxy || echo "Directory https-proxy not found or ls failed"
+          echo "--- Check if https-proxy.app exists ---"
+          ls -lah *.app || echo "No .app files found in current directory"
+      - name: Upload macOS artifact
+        if: matrix.os == 'macos-latest'
+        uses: actions/upload-artifact@v4
+        with:
+          name: https-proxy-${{ replace(matrix.os, '-latest', '') }}-${{ inputs.version }}
+          path: https-proxy-macos-${{ inputs.version }}.zip
+          if-no-files-found: error
+      - name: Upload Linux/Windows artifact
+        if: matrix.os != 'macos-latest'
         uses: actions/upload-artifact@v4
         with:
-            name: https-proxy-${{ matrix.os }}-${{ inputs.version }}
-            path: https-proxy
-            if-no-files-found: error
+          name: https-proxy-${{ replace(matrix.os, '-latest', '') }}-${{ inputs.version }}
+          path: https-prox
+          if-no-files-found: error
+