cocktailpeanut 1 miesiąc temu
rodzic
commit
631da13d99
2 zmienionych plików z 54 dodań i 52 usunięć
  1. 52 50
      .github/workflows/build.yml
  2. 2 2
      package.json

+ 52 - 50
.github/workflows/build.yml

@@ -62,45 +62,46 @@ jobs:
           #args: --win --dir  # Build win-unpacked only
           args: --win
 
-      - name: Check contents
-        run: |
-          dir dist-win32 \
-          dir dist-win32\\win-unpacked
-        shell: cmd
+#      - name: Check contents
+#        run: |
+#          dir dist-win32 \
+#          dir dist-win32\\win-unpacked
+#        shell: cmd
 
 ### sign start
 
-#      - name: upload-unsigned-artifact
-#        id: upload-unsigned-artifact
-#        uses: actions/upload-artifact@v4
-#        with:
-#          #path: dist-win32
-#          path: dist-win32/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'
-#          signing-policy-slug: 'release-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: upload-unsigned-artifact
+        id: upload-unsigned-artifact
+        uses: actions/upload-artifact@v4
+        with:
+          #path: dist-win32
+          #path: dist-win32/win-unpacked/Pinokio.exe
+          path: dist-win32/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'
+          signing-policy-slug: 'release-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-win32\win-unpacked\Pinokio.exe"
 #        shell: cmd
-#
-#### sign end
-#
+
+### sign end
+
 #      # Build the final installer from the signed exe
 #      - name: Build final installer
 #        env:
@@ -112,25 +113,26 @@ jobs:
 #          yarn run electron-builder --win --prepackaged dist-win32/win-unpacked --publish always
 
 
-#      - 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 upload "v$PACKAGE_VERSION" ./dist-win32/*.exe .dist-win32/latest.yml ./dist-win32/*.exe.blockmap
-#          #gh release create "v$PACKAGE_VERSION" ./dist-win32/*.exe \
-#          #  --title "Release v$PACKAGE_VERSION" \
-#          #  --notes "Pinokio version $PACKAGE_VERSION."
+      - 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 upload "v$PACKAGE_VERSION" ./dist-win32/*.exe .dist-win32/latest.yml ./dist-win32/*.exe.blockmap
+          gh release upload "v$PACKAGE_VERSION" ./signed-windows/*.exe ./dist-win32/latest.yml ./dist-win32/*.exe.blockmap
+          #gh release create "v$PACKAGE_VERSION" ./dist-win32/*.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.38.0",
+  "version": "3.39.0",
   "homepage": "https://pinokio.co",
   "description": "pinokio",
   "main": "main.js",
@@ -119,7 +119,7 @@
     "electron-store": "^8.1.0",
     "electron-updater": "^6.6.2",
     "electron-window-state": "^5.0.3",
-    "pinokiod": "^3.38.0"
+    "pinokiod": "^3.39.0"
   },
   "devDependencies": {
     "@electron/rebuild": "3.2.10",