pinggy 0.2.3 → 0.3.1

package/.github/workflows/publish-binaries.yml

@@ -4,6 +4,10 @@ on:
   release:
     types: [created]
 
+env:
+  RELEASE_TAG: ${{ github.event.release.tag_name }}
+
+
 jobs:
   Ubuntu:
     name: Build on ${{ matrix.name }} and upload to GitHub Release
@@ -33,90 +37,26 @@ jobs:
       - name: Build (tsup)
         run: npm run build
 
-      - name: Run caxa build to produce `bin/`
-        run: make pack
+      - name: Run pkg build for x64
+        if: ${{ matrix.name == 'Ubuntu-x64' }}
+        run: npm run pack:linux-x64
 
-      - name: Import Code Signing Certificate
-        env:
-          MACOS_CERTIFICATE: ${{ secrets.MACOS_CERTIFICATE }}
-          MACOS_CERTIFICATE_PWD: ${{ secrets.MACOS_CERTIFICATE_PWD }}
-        run: |
-          # Create temporary keychain
-          KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
-          KEYCHAIN_PASSWORD=$(openssl rand -base64 32)
-          
-          # Decode certificate and import to keychain
-          echo "$MACOS_CERTIFICATE" | base64 --decode > certificate.p12
-          security create-keychain -p "$KEYCHAIN_PASSWORD" "$KEYCHAIN_PATH"
-          security set-keychain-settings -lut 21600 "$KEYCHAIN_PATH"
-          security unlock-keychain -p "$KEYCHAIN_PASSWORD" "$KEYCHAIN_PATH"
-          security import certificate.p12 -k "$KEYCHAIN_PATH" -P "$MACOS_CERTIFICATE_PWD" -T /usr/bin/codesign
-          security list-keychain -d user -s "$KEYCHAIN_PATH"
-          security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$KEYCHAIN_PASSWORD" "$KEYCHAIN_PATH"
-          
-          # Clean up certificate file
-          rm certificate.p12
-      
-      - name: Code Sign Binary
-        env:
-          DEVELOPER_ID: ${{ secrets.MACOS_DEVELOPER_ID }}
-        run: |
-          FILE=$(ls bin)
-          echo "Code signing: $FILE"
-          codesign --force --options runtime --sign "$DEVELOPER_ID" --timestamp "bin/$FILE"
-          codesign --verify --verbose "bin/$FILE"
-      
-      - name: Notarize Binary (Optional)
-        env:
-          APPLE_ID: ${{ secrets.APPLE_ID }}
-          APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}
-          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
-        run: |
-          FILE=$(ls bin)
-          
-          # Create a zip for notarization
-          ditto -c -k --keepParent "bin/$FILE" "bin/$FILE.zip"
-          
-          # Submit for notarization
-          xcrun notarytool submit "bin/$FILE.zip" \
-            --apple-id "$APPLE_ID" \
-            --password "$APPLE_APP_SPECIFIC_PASSWORD" \
-            --team-id "$APPLE_TEAM_ID" \
-            --wait
-          
-          # Remove zip file
-          rm "bin/$FILE.zip"
-          
-          echo "Notarization complete"
+      - name: Run pkg build for arm64
+        if: ${{ matrix.name == 'Ubuntu-arm64' }}
+        run: npm run pack:linux-arm64
 
-      - name: Show bin directory
-        run: ls -R ./bin
+      - name: Show out directory
+        run: ls -R ./out        
 
       - name: Upload artifact to GitHub Release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         shell: bash
         run: |
-          VERSION=$(git describe --tags --always)
-
-          # Extract the single generated file (e.g., pinggy-linux-x64)
-          FILE=$(ls bin)
-
-          echo "Detected build artifact: $FILE"
-
-          # Create release if not exists
-          gh release create "$VERSION" --notes "Release $VERSION" --title "$VERSION" || true
-
-          echo "Uploading $FILE to GitHub Release…"
-          gh release upload "$VERSION" "bin/$FILE" --clobber
-
-      - name: Cleanup Keychain
-        if: always()
-        run: |
-          KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
-          if [ -f "$KEYCHAIN_PATH" ]; then
-            security delete-keychain "$KEYCHAIN_PATH"
-          fi
+          for FILE in out/*; do
+            echo "Uploading $FILE"
+            gh release upload "$RELEASE_TAG" "$FILE" --clobber
+          done
   
   Windows:
     name: Build on ${{ matrix.name }} and upload
@@ -150,29 +90,26 @@ jobs:
       - name: Build (tsup)
         run: npm run build
 
-      - name: Run caxa build to produce `bin/`
-        run: make pack
+      - name: Run pkg build for x64
+        if: ${{ matrix.name == 'Windows-x64' }}
+        run: npm run pack:win-x64
+        
+      - name: Run pkg build for arm64
+        if: ${{ matrix.name == 'Windows-arm64' }}
+        run: npm run pack:win-arm64
       
-      - name: See bin directory
-        run: ls -R ./bin
+      - name: See out directory
+        run: ls -R ./out
 
       - name: Upload artifact to GitHub Release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         shell: bash
         run: |
-          VERSION=$(git describe --tags --always)
-
-          # Extract the single generated file (e.g., pinggy-windows-x64)
-          FILE=$(ls bin)
-
-          echo "Detected build artifact: $FILE"
-
-          # Create release if not exists
-          gh release create "$VERSION" --notes "Release $VERSION" --title "$VERSION" || true
-
-          echo "Uploading $FILE to GitHub Release…"
-          gh release upload "$VERSION" "bin/$FILE" --clobber
+          for FILE in out/*; do
+            echo "Uploading $FILE"
+            gh release upload "$RELEASE_TAG" "$FILE" --clobber
+          done
 
 
   MacOS:
@@ -203,26 +140,84 @@ jobs:
       - name: Build (tsup)
         run: npm run build
 
-      - name: Run caxa build to produce `bin/`
-        run: make pack
+      - name: Run pkg build for x64
+        if: ${{ matrix.name == 'MacOS-x64' }}
+        run: npm run pack:macos-x64
+        
+      - name: Run pkg build for arm64
+        if: ${{ matrix.name == 'MacOS-arm64' }}
+        run: npm run pack:macos-arm64
+
+      - name: Import Code Signing Certificate
+        env:
+          MACOS_CERTIFICATE: ${{ secrets.MACOS_CERTIFICATE }}
+          MACOS_CERTIFICATE_PWD: ${{ secrets.MACOS_CERTIFICATE_PWD }}
+        run: |
+          # Create temporary keychain
+          KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
+          KEYCHAIN_PASSWORD=$(openssl rand -base64 32)
+          
+          # Decode certificate and import to keychain
+          echo "$MACOS_CERTIFICATE" | base64 --decode > certificate.p12
+          security create-keychain -p "$KEYCHAIN_PASSWORD" "$KEYCHAIN_PATH"
+          security set-keychain-settings -lut 21600 "$KEYCHAIN_PATH"
+          security unlock-keychain -p "$KEYCHAIN_PASSWORD" "$KEYCHAIN_PATH"
+          security import certificate.p12 -k "$KEYCHAIN_PATH" -P "$MACOS_CERTIFICATE_PWD" -T /usr/bin/codesign
+          security list-keychain -d user -s "$KEYCHAIN_PATH"
+          security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$KEYCHAIN_PASSWORD" "$KEYCHAIN_PATH"
+          
+          # Clean up certificate file
+          rm certificate.p12
       
-      - name: See bin directory
-        run: ls -R ./bin
+      - name: Code Sign Binary
+        env:
+          DEVELOPER_ID: ${{ secrets.MACOS_DEVELOPER_ID }}
+        run: |
+          FILE=$(ls out)
+          echo "Code signing: $FILE"
+          codesign --deep --force --options runtime --sign "$DEVELOPER_ID" --timestamp --entitlements ent.plist "out/$FILE"
+          codesign --verify --verbose "out/$FILE"
+      
+      - name: Notarize Binary (Optional)
+        env:
+          APPLE_ID: ${{ secrets.APPLE_ID }}
+          APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}
+          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+        run: |
+          FILE=$(ls out)
+          
+          # Create a zip for notarization
+          ditto -c -k --keepParent "out/$FILE" "out/$FILE.zip"
+          
+          # Submit for notarization
+          xcrun notarytool submit "out/$FILE.zip" \
+            --apple-id "$APPLE_ID" \
+            --password "$APPLE_APP_SPECIFIC_PASSWORD" \
+            --team-id "$APPLE_TEAM_ID" \
+            --wait
+          
+          # Remove zip file
+          rm "out/$FILE.zip"
+          
+          echo "Notarization complete"
+      
+      - name: See out directory
+        run: ls -R ./out
 
       - name: Upload artifact to GitHub Release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         shell: bash
         run: |
-         VERSION=$(git describe --tags --always)
-
-          # Get the file in bin/ (e.g., pinggy-macos-x64)
-          FILE=$(ls bin)
-          echo "Detected build artifact: $FILE"
-
-          # Create release if it does not exist
-          gh release create "$VERSION" --notes "Release $VERSION" --title "$VERSION" || true
-
-          echo "Uploading $FILE to GitHub Release…"
-          gh release upload "$VERSION" "bin/$FILE" --clobber
+          for FILE in out/*; do
+            echo "Uploading $FILE"
+            gh release upload "$RELEASE_TAG" "$FILE" --clobber
+          done
 
+      - name: Cleanup Keychain
+        if: always()
+        run: |
+          KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
+          if [ -f "$KEYCHAIN_PATH" ]; then
+            security delete-keychain "$KEYCHAIN_PATH"
+          fi

package/Makefile

@@ -1,4 +1,4 @@
 pack:
-	node caxa_build.js
+	npm run pack:all
 clean:
-	rm -rf bin
+	rm -rf out