Merge pull request #14 from potherca-contrib/GovertDev

Fix forge config
SimplyEdit · Sep 9, 2024 · 97f26f4 · 97f26f4
2 parents 7e95d7a + 09042b9
commit 97f26f4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 74 deletions.
diff --git a/.github/workflows/make-mac.yml b/.github/workflows/make-mac.yml
@@ -10,15 +10,15 @@ jobs:
       matrix:
         python-version: ["3.11"]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v5
       with:
          python-version: ${{ matrix.python-version }}
       # You can test your matrix by printing the current Python version
     - name: Display Python version
       run: python -c "import sys; print(sys.version)"
-    - uses: actions/setup-node@master
+    - uses: actions/setup-node@v4
       with:
         node-version: 20
     - name: install dependencies
@@ -28,6 +28,8 @@ jobs:
 
     - name: Publish app
       run: npm run publish
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   # build:
   #   strategy:

diff --git a/forge.config.js b/forge.config.js
@@ -3,28 +3,24 @@ const { FuseV1Options, FuseVersion } = require('@electron/fuses');
 const path = require('path');
 
 module.exports = {
-  packagerConfig: {
-    asar: true,
-  },
-  rebuildConfig: {},
   makers: [
     {
       name: '@electron-forge/maker-squirrel',
-      platforms: ['darwin', 'linux', 'windows'],
+      platforms: ['linux', 'windows'],
       config: {
         bin: 'simplycode',
       }
     },
     {
       name: '@electron-forge/maker-dmg',
-      platforms: ['darwin', 'linux'],
+      platforms: ['darwin'],
       config: {
         bin: 'simplycode',
       },
     },
     {
       name: '@electron-forge/maker-deb',
-      platforms: ['darwin', 'linux'],
+      platforms: ['linux'],
       config: {
         bin: 'simplycode',
         options: {
@@ -33,29 +29,12 @@ module.exports = {
     },
     {
       name: '@electron-forge/maker-rpm',
-      platforms: ['darwin', 'linux'],
+      platforms: ['linux'],
       config: {
         bin: 'simplycode',
       }
     }
   ],
-  plugins: [
-    {
-      name: '@SimplyEdit/simplycode-electron/tree/electron-forge-github-actions',
-      config: {},
-    },
-    // Fuses are used to enable/disable various Electron functionality
-    // at package time, before code signing the application
-    new FusesPlugin({
-      version: FuseVersion.V1,
-      [FuseV1Options.RunAsNode]: false,
-      [FuseV1Options.EnableCookieEncryption]: true,
-      [FuseV1Options.EnableNodeOptionsEnvironmentVariable]: false,
-      [FuseV1Options.EnableNodeCliInspectArguments]: false,
-      [FuseV1Options.EnableEmbeddedAsarIntegrityValidation]: true,
-      [FuseV1Options.OnlyLoadAppFromAsar]: true,
-    }),
-  ],
   publishers: [
     {
       name: '@electron-forge/publisher-github',
@@ -68,4 +47,4 @@ module.exports = {
       }
     }
   ]
-};
+}
diff --git a/package.json b/package.json
@@ -45,51 +45,6 @@
     "simplycode": "github:simplyedit/simplycode"
   },
   "config": {
-    "forge": {
-      "makers": [
-          {
-            "name": "@electron-forge/maker-squirrel",
-            "platforms": ["linux", "windows"],
-            "config": {
-              "bin": "simplycode"
-            }
-          },
-          {
-            "name": "@electron-forge/maker-dmg",
-            "platforms": ["darwin"],
-            "config": {
-              "bin": "simplycode"
-            }
-          },
-          {
-            "name": "@electron-forge/maker-deb",
-            "platforms": ["linux"],
-            "config": {
-              "bin": "simplycode",
-              "options": {
-              }
-            }
-          },
-          {
-            "name": "@electron-forge/maker-rpm",
-            "platforms": ["linux"],
-            "config": {
-              "bin": "simplycode"
-            }
-          }
-      ],
-      "publishers": [
-        {
-        "name": "@electron-forge/publisher-github",
-        "config": {
-          "repository": {
-            "owner": "SimplyEdit",
-            "name": "simplycode-electron"
-          },
-          "prerelease": true
-        }
-      }
-    ]
-    }
+    "forge": "forge.config.js"
   }
 }