CRISTAL-311: Improve Cristal distributions

Build for more architectures.
xwiki-contrib · Dec 30, 2024 · d496d83 · d496d83
1 parent f1895d4
commit d496d83
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/.github/workflows/build_electron.yml b/.github/workflows/build_electron.yml
@@ -37,8 +37,9 @@ jobs:
       - uses: softprops/action-gh-release@v2
         with:
           files: |
-            electron/dist/cristal-*.tar.gz
-            electron/dist/cristal-*.deb
+            electron/dist/cristal-*.*
+            electron/dist/latest.yml
+            electron/dist/latest-linux.yml
           tag_name: ${{ github.ref }}
           draft: true
   electron-mac:
@@ -72,6 +73,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - uses: softprops/action-gh-release@v2
         with:
-          files: electron/dist/cristal-*.exe
+          files: electron/dist/cristal-*.*
           tag_name: ${{ github.ref }}
           draft: true
diff --git a/electron/.electron-builder.config.js b/electron/.electron-builder.config.js
@@ -35,7 +35,6 @@ module.exports = async function () {
     asar: true,
     appId: "org.xwiki.cristal",
     productName: "cristal",
-    artifactName: "${productName}-${version}-${arch}.${ext}",
     directories: {
       output: "dist",
       buildResources: "buildResources",
@@ -47,14 +46,19 @@ module.exports = async function () {
 
     // Specify linux target just for disabling snap compilation
     linux: {
-      target: "deb",
+      artifactName: "${productName}-${version}-linux-${arch}.${ext}",
+      executableName: "cristal",
       category: "Application",
     },
     mac: {
+      artifactName: "${productName}-${version}-mac-${arch}.${ext}",
+      executableName: "cristal",
       target: "dmg",
       category: "Application",
     },
     win: {
+      artifactName: "${productName}-${version}-win-${arch}.${ext}",
+      executableName: "cristal",
       target: "nsis",
     },
   };

diff --git a/electron/package.json b/electron/package.json
@@ -15,9 +15,9 @@
   },
   "main": "./main/dist/index.cjs",
   "scripts": {
-    "build:linux": "electron-builder --linux deb tar.gz --x64 --config .electron-builder.config.js --dir",
+    "build:linux": "electron-builder --linux snap deb rpm AppImage --x64 --config .electron-builder.config.js --dir",
     "build:mac": "electron-builder --mac dmg --x64 --arm64 --config .electron-builder.config.js --dir",
-    "build:win": "electron-builder --win nsis --ia32 --x64 --config .electron-builder.config.js --dir",
+    "build:win": "electron-builder --win nsis msi --x64 --ia32 --config .electron-builder.config.js --dir",
     "clean": "rimraf dist",
     "start": "electron ."
   },