Re-enable standalone utility notarization (wpilibsuite#572)

wpineth · Mar 29, 2024 · a044dc9 · a044dc9
1 parent b60ff79
commit a044dc9
Showing 1 changed file with 31 additions and 31 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -26,37 +26,37 @@ jobs:
           npm run packageMac
         name: Build Standalone Utility
         working-directory: wpilib-utility-standalone
-      # - name: Import Developer ID Certificate
-      #   uses: wpilibsuite/import-signing-certificate@v1
-      #   with:
-      #     certificate-data: ${{ secrets.APPLE_CERTIFICATE_DATA }}
-      #     certificate-passphrase: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
-      #     keychain-password: ${{ secrets.APPLE_KEYCHAIN_PASSWORD }}
-      #   if: |
-      #     (github.repository_owner == 'wpilibsuite') &&
-      #     (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))
-      # - name: Sign Standalone Utility
-      #   run: npm run signMac
-      #   working-directory: wpilib-utility-standalone
-      #   if: |
-      #     (github.repository_owner == 'wpilibsuite') &&
-      #     (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))
-      # - name: Notarize Standalone Utility
-      #   uses: wpilibsuite/xcode-notarize@v1
-      #   with:
-      #     product-path: "wpilib-utility-standalone/build/wpilibutility-darwin-x64/wpilibutility.app"
-      #     primary-bundle-id: edu.wpi.first.wpilibutility
-      #     appstore-connect-username: ${{ secrets.APPLE_NOTARIZATION_USERNAME }}
-      #     appstore-connect-password: ${{ secrets.APPLE_NOTARIZATION_PASSWORD }}
-      #   if: |
-      #     (github.repository_owner == 'wpilibsuite') &&
-      #     (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))
-      # - name: Staple Notarization Ticket
-      #   run: xcrun stapler staple -v wpilibutility.app
-      #   working-directory: wpilib-utility-standalone/build/wpilibutility-darwin-x64
-      #   if: |
-      #     (github.repository_owner == 'wpilibsuite') &&
-      #     (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))
+      - name: Import Developer ID Certificate
+        uses: wpilibsuite/import-signing-certificate@v1
+        with:
+          certificate-data: ${{ secrets.APPLE_CERTIFICATE_DATA }}
+          certificate-passphrase: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
+          keychain-password: ${{ secrets.APPLE_KEYCHAIN_PASSWORD }}
+        if: |
+          (github.repository_owner == 'wpilibsuite') &&
+          (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))
+      - name: Sign Standalone Utility
+        run: npm run signMac
+        working-directory: wpilib-utility-standalone
+        if: |
+          (github.repository_owner == 'wpilibsuite') &&
+          (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))
+      - name: Notarize Standalone Utility
+        uses: wpilibsuite/xcode-notarize@v1
+        with:
+          product-path: "wpilib-utility-standalone/build/wpilibutility-darwin-x64/wpilibutility.app"
+          primary-bundle-id: edu.wpi.first.wpilibutility
+          appstore-connect-username: ${{ secrets.APPLE_NOTARIZATION_USERNAME }}
+          appstore-connect-password: ${{ secrets.APPLE_NOTARIZATION_PASSWORD }}
+        if: |
+          (github.repository_owner == 'wpilibsuite') &&
+          (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))
+      - name: Staple Notarization Ticket
+        run: xcrun stapler staple -v wpilibutility.app
+        working-directory: wpilib-utility-standalone/build/wpilibutility-darwin-x64
+        if: |
+          (github.repository_owner == 'wpilibsuite') &&
+          (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))
       - run: tar -C build/wpilibutility-darwin-x64 -pcvzf wpilibutility-mac.tar.gz .
         working-directory: wpilib-utility-standalone
         name: Create Archive