cocktailpeanut 1 mēnesi atpakaļ
vecāks
revīzija
f748e49402
2 mainītis faili ar 47 papildinājumiem un 33 dzēšanām
  1. 45 31
      .github/workflows/build.yml
  2. 2 2
      package.json

+ 45 - 31
.github/workflows/build.yml

@@ -55,44 +55,58 @@ jobs:
           #release: ${{ startsWith(github.ref, 'refs/tags/v') }}
           #release: true
           release: false
+          args: --win --dir  # Build win-unpacked only
 
       - name: upload-unsigned-artifact
         id: upload-unsigned-artifact
         uses: actions/upload-artifact@v4
         with:
-          path: dist-win32
+          #path: dist-win32
+          path: dist/win-unpacked/Pinokio.exe
           retention-days: 1
 
-#      - id: Sign
-#        if: ${{ runner.os == 'Windows' }}
-#        uses: signpath/github-action-submit-signing-request@v1.1
-#        with:
-#          api-token: '${{ secrets.SIGNPATH_API_TOKEN }}'
-#          organization-id: 'd2da0df2-dc12-4516-8222-87178d5ebf3d'
-#          project-slug: 'pinokio'
-#          signing-policy-slug: 'test-signing'
-#          github-artifact-id: '${{ steps.upload-unsigned-artifact.outputs.artifact-id }}'
-#          wait-for-completion: true
-#          output-artifact-directory: './signed-windows'
-#          parameters: |
-#            version: ${{ toJSON(github.ref_name) }}
-#
-#      - name: Get package.json version
-#        id: get_version
-#        shell: bash
-#        run: |
-#          PACKAGE_VERSION=$(node -p "require('./package.json').version")
-#          echo "PACKAGE_VERSION=$PACKAGE_VERSION" >> $GITHUB_ENV
-#
-#      - name: Publish GitHub Release with gh
-#        shell: bash
-#        env:
-#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#        run: |
-#          echo "Releasing version $PACKAGE_VERSION"
-#          gh release create "v$PACKAGE_VERSION" ./signed-windows/*.exe \
-#            --title "Release v$PACKAGE_VERSION" \
-#            --notes "Pinokio version $PACKAGE_VERSION."
+      - id: Sign
+        if: ${{ runner.os == 'Windows' }}
+        uses: signpath/github-action-submit-signing-request@v1.1
+        with:
+          api-token: '${{ secrets.SIGNPATH_API_TOKEN }}'
+          organization-id: 'd2da0df2-dc12-4516-8222-87178d5ebf3d'
+          project-slug: 'pinokio'
+          signing-policy-slug: 'test-signing'
+          github-artifact-id: '${{ steps.upload-unsigned-artifact.outputs.artifact-id }}'
+          wait-for-completion: true
+          output-artifact-directory: './signed-windows'
+          parameters: |
+            version: ${{ toJSON(github.ref_name) }}
+
+      # Replace the unsigned exe with the signed exe
+      - name: Replace with signed exe
+        run: |
+          copy /Y ".\signed-windows\Pinokio.exe" ".\dist\win-unpacked\Pinokio.exe"
+
+      # Build the final installer from the signed exe
+      - name: Build final installer
+        run: |
+          yarn run electron-builder --win --prepackaged dist/win-unpacked
+
+
+      - name: Get package.json version
+        id: get_version
+        shell: bash
+        run: |
+          PACKAGE_VERSION=$(node -p "require('./package.json').version")
+          echo "PACKAGE_VERSION=$PACKAGE_VERSION" >> $GITHUB_ENV
+
+      - name: Publish GitHub Release with gh
+        shell: bash
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          echo "Releasing version $PACKAGE_VERSION"
+          #gh release create "v$PACKAGE_VERSION" ./signed-windows/*.exe \
+          gh release create "v$PACKAGE_VERSION" ./dist/*.exe \
+            --title "Release v$PACKAGE_VERSION" \
+            --notes "Pinokio version $PACKAGE_VERSION."
 
   mac:
     needs: "create-release"

+ 2 - 2
package.json

@@ -1,7 +1,7 @@
 {
   "name": "Pinokio",
   "private": true,
-  "version": "3.20.12",
+  "version": "3.20.13",
   "homepage": "https://pinokio.co",
   "description": "pinokio",
   "main": "main.js",
@@ -128,7 +128,7 @@
     "electron-store": "^8.1.0",
     "electron-updater": "^6.6.2",
     "electron-window-state": "^5.0.3",
-    "pinokiod": "^3.20.12"
+    "pinokiod": "^3.20.13"
   },
   "devDependencies": {
     "@electron/rebuild": "3.2.10",