add teamid export step

Author: seriouscatsoserious

.github/workflows/build.yml

@@ -35,40 +35,98 @@ jobs:
           CI: false
         run: npm run react-build
 
-      - name: Build Electron app
-        if: matrix.os != 'ubuntu-latest-large'
+      # ---------------------------
+      # macOS Build
+      # ---------------------------
+      - name: Debug environment (macOS)
+        if: matrix.os == 'macos-latest'
+        run: |
+          echo "===== DEBUGGING ENVIRONMENT ====="
+          echo "API Key ID: [MASKED]"
+          echo "API Issuer: [MASKED]"
+          echo "Certificate: [MASKED]"
+          echo "================================="
+      
+      - name: Setup macOS certificates
+        if: matrix.os == 'macos-latest'
         env:
-          DEBUG: electron-builder
+          MACOS_CERTIFICATE: ${{ secrets.MACOS_CERTIFICATE }}
+          MACOS_CERTIFICATE_PASSWORD: ${{ secrets.MACOS_CERTIFICATE_PASSWORD }}
+        run: |
+          # Create keychain
+          security create-keychain -p "" build.keychain
+          security default-keychain -s build.keychain
+          security unlock-keychain -p "" build.keychain
+          
+          # Import certificate
+          echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12
+          security import certificate.p12 -k build.keychain -P $MACOS_CERTIFICATE_PASSWORD -T /usr/bin/codesign
+          security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "" build.keychain
+          
+          # Clean up
+          rm certificate.p12
+
+      - name: Build and Sign Electron app (macOS)
+        if: matrix.os == 'macos-latest'
+        env:
+          DEBUG: electron-builder,electron-builder:*
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          # macOS signing environment variables
-          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
-          APPLE_API_KEY: ${{ secrets.APPLE_API_KEY }}
-          APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }}
-          APPLE_API_ISSUER: ${{ secrets.APPLE_API_ISSUER }}
+          
+          # Apple notarization credentials
+          APPLE_TEAM_ID: ${{ secrets.GODOT_MACOS_NOTARIZATION_API_UUID }}
+          APPLE_API_KEY: ${{ secrets.GODOT_MACOS_NOTARIZATION_API_KEY }}
+          APPLE_API_KEY_ID: ${{ secrets.GODOT_MACOS_NOTARIZATION_API_KEY_ID }}
+          APPLE_API_ISSUER: ${{ secrets.GODOT_MACOS_NOTARIZATION_API_UUID }}
+          
+          # Signing certificate
           CSC_LINK: ${{ secrets.MACOS_CERTIFICATE }}
           CSC_KEY_PASSWORD: ${{ secrets.MACOS_CERTIFICATE_PASSWORD }}
+        run: |
+          # Show electron-builder version
+          npx electron-builder --version
+          
+          # Pre-sign any nested binaries (similar to the bash script)
+          find . -type f -path "*/Resources/*/bin/*" -exec codesign --force --sign "$APPLE_TEAM_ID" --options runtime {} \;
+          
+          # Build with electron-builder
+          npx electron-builder --mac --x64 --arm64 --publish=never
+          
+          # Verify signing and notarization for both architectures
+          echo "Verifying x64 build..."
+          spctl --assess --verbose=4 "dist/mac-universal/Drivechain Launcher.app"
+          xcrun stapler validate "dist/mac-universal/Drivechain Launcher.app"
+          
+          echo "Verifying arm64 build..."
+          spctl --assess --verbose=4 "dist/mac-arm64/Drivechain Launcher.app"
+          xcrun stapler validate "dist/mac-arm64/Drivechain Launcher.app"
+
+      # ---------------------------
+      # Windows Build
+      # ---------------------------
+      - name: Build Electron app (Windows)
+        if: matrix.os == 'windows-latest'
+        env:
+          DEBUG: electron-builder
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: npm run electron-build
 
+      # ---------------------------
+      # Linux Build
+      # ---------------------------
       - name: Build Electron app (Linux)
         if: matrix.os == 'ubuntu-latest-large'
         env:
           DEBUG: electron-builder
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          # Show electron-builder version
           npx electron-builder --version
-          
-          # List contents before build
           ls -la
-          
-          # Run build with verbose logging
           npx electron-builder --linux AppImage --x64
-          
-          # Show build output directory
-          echo "Build output directory contents:"
           ls -la dist/
 
-      # Upload artifacts based on platform
+      # ---------------------------
+      # Upload Artifacts
+      # ---------------------------
       - name: Check Linux build output
         if: matrix.os == 'ubuntu-latest-large'
         run: |
@@ -78,34 +136,34 @@ jobs:
             exit 1
           fi
           find dist -type f -name "*.AppImage" || echo "No AppImage files found in dist/"
-          
+
       - name: Upload Linux artifacts
         if: matrix.os == 'ubuntu-latest-large'
         uses: actions/upload-artifact@v4
         with:
           name: linux-build
-          path: |
-            dist/*.AppImage
+          path: dist/*.AppImage
           if-no-files-found: error
 
       - name: Upload Windows artifacts
         if: matrix.os == 'windows-latest'
         uses: actions/upload-artifact@v4
         with:
           name: windows-build
-          path: |
-            dist/*.exe
+          path: dist/*.exe
           if-no-files-found: error
 
       - name: Upload macOS artifacts
         if: matrix.os == 'macos-latest'
         uses: actions/upload-artifact@v4
         with:
           name: macos-build
-          path: |
-            dist/*.dmg
+          path: dist/*.dmg
           if-no-files-found: error
 
+  # ----------------------------------
+  # Upload to your server step
+  # ----------------------------------
   upload-to-releases:
     name: Upload to releases.drivechain.info
     runs-on: ubuntu-latest
@@ -131,50 +189,37 @@ jobs:
 
       - name: Process artifacts
         run: |
-          # Process Linux artifact
+          # (Linux) rename AppImage
           cd artifacts/linux-build
           mv *.AppImage ../../drivechain-launcher-latest-x86_64-linux.AppImage
           cd ../..
           
-          # Process Windows artifact
+          # (Windows) zip up the .exe
           cd artifacts/windows-build
-          echo "Windows build directory contents before processing:"
-          ls -la
-          
-          # Find the exact exe file
           EXE_FILE=$(ls Drivechain-Launcher-Setup-*.exe 2>/dev/null || echo "")
           if [ -z "$EXE_FILE" ]; then
             echo "Error: No Windows exe file found"
             exit 1
           fi
-          echo "Found Windows exe file: $EXE_FILE"
-          
-          # Create zip file containing the exe
           zip ../../drivechain-launcher-latest-windows.zip "$EXE_FILE"
           cd ../..
           
-          # Process macOS artifacts
+          # (macOS) rename the DMGs
           cd artifacts/macos-build
-          echo "macOS build directory contents before processing:"
-          ls -la
-          
-          # Process arm64 DMG
           ARM64_DMG=$(ls *-arm64.dmg 2>/dev/null || echo "")
           if [ -z "$ARM64_DMG" ]; then
             echo "Error: No arm64 DMG file found"
             exit 1
           fi
           mv "$ARM64_DMG" ../../drivechain-launcher-latest-osx-arm64.dmg
           
-          # Process x64 DMG
           X64_DMG=$(ls *-x64.dmg 2>/dev/null || echo "")
           if [ -z "$X64_DMG" ]; then
             echo "Error: No x64 DMG file found"
             exit 1
           fi
           mv "$X64_DMG" ../../drivechain-launcher-latest-osx-x64.dmg
           cd ../..
-          
           echo "Final files:"
           ls -la drivechain-launcher-*
 

package.json

@@ -148,7 +148,12 @@
       "entitlements": "entitlements.mac.plist",
       "entitlementsInherit": "entitlements.mac.plist",
       "notarize": {
-        "teamId": "$APPLE_TEAM_ID"
+        "teamId": "${env.APPLE_TEAM_ID}",
+        "tool": "notarytool",
+        "keychain": "build.keychain",
+        "keyID": "${env.APPLE_API_KEY_ID}",
+        "keyFile": "${env.APPLE_API_KEY}",
+        "issuer": "${env.APPLE_API_ISSUER}"
       },
       "extendInfo": {
         "NSAppleEventsUsageDescription": "Please allow access to script browser applications to detect drivechain nodes.",