fixes

Author: Chetan11-dev

.github/workflows/package.yaml

@@ -17,8 +17,8 @@ jobs:
           node-version: 20
           cache: npm
 
-      - name: Recreate certificate.p12 from Base64
-        run: echo "${{ secrets.CSC_BASE64_ENCODED }}" | base64 -d > certificate.p12
+      # - name: Recreate certificate.p12 from Base64
+      #   run: echo "${{ secrets.CSC_BASE64_ENCODED }}" | base64 -d > certificate.p12
 
       - name: npm install
         run: |
@@ -29,21 +29,13 @@ jobs:
           APPLE_ID: ${{ secrets.APPLE_ID }}
           APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}
           APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
-          CSC_LINK: ./certificate.p12
+          CSC_LINK: ${{ secrets.CSC_LINK }}
           CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
-        run: |
-          npm run package
-
-      - name: Install packages needed for S3 upload
-        run: |
-          python -m pip install botasaurus boto3
-
-      - name: Upload to S3
-        env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}        
         run: |
-          python .erb/scripts/upload-to-s3.py
+          npm run package-publish
+
 
   package-windows:
     timeout-minutes: 30
@@ -65,18 +57,10 @@ jobs:
 
       - name: Package
         run: |
-          npm run package
-
-      - name: Install botasaurus package
-        run: |
-          python -m pip install botasaurus boto3
-
-      - name: Upload to S3
+          npm run package-publish
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}        
-        run: |
-          python .erb/scripts/upload-to-s3.py
 
   package-linux:
     timeout-minutes: 30
@@ -98,15 +82,7 @@ jobs:
 
       - name: Package
         run: |
-          npm run package
-
-      - name: Install packages needed for S3 upload
-        run: |
-          python -m pip install botasaurus boto3
-
-      - name: Upload to S3
+          npm run package-publish
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}        
-        run: |
-          python .erb/scripts/upload-to-s3.py                  

package.json

@@ -43,6 +43,7 @@
     "lint": "cross-env NODE_ENV=development eslint . --ext .js,.jsx,.ts,.tsx",
     "lint:fix": "cross-env NODE_ENV=development eslint . --ext .js,.jsx,.ts,.tsx --fix",
     "package": "ts-node ./.erb/scripts/clean.js dist && npm run build && electron-builder build --publish never && npm run build:dll",
+    "package-publish": "ts-node ./.erb/scripts/clean.js dist && npm run build && electron-builder build  --publish always && npm run build:dll",
     "package:mac-unsigned": "webpack --config ./.erb/configs/webpack.config.main.dev.ts && ts-node ./.erb/scripts/clean.js dist && npm run build && electron-builder build -c.mac.identity=null --publish never && npm run build:dll",
     "rebuild": "electron-rebuild --parallel --types prod,dev,optional --module-dir release/app",
     "prestart": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.main.dev.ts",
@@ -250,7 +251,10 @@
     "extraResources": [
       "./assets/**"
     ],
-    "publish": null
+    "publish": {
+      "provider": "s3",
+      "bucket": "dededededwdefrfr"
+    }
   },
   "collective": {
     "url": "https://opencollective.com/electron-react-boilerplate-594"