test some structures

CNOCTAVE · Nov 15, 2024 · 06a5ee6 · 06a5ee6
1 parent 1556523
commit 06a5ee6
Show file tree

Hide file tree

Showing 7 changed files with 182 additions and 32 deletions.
diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml
@@ -157,6 +157,70 @@ jobs:
       - run: npm ci
       - run: npm run build-mac_7z_universal
 
+  mac_default-build:
+    runs-on: macos-latest
+    env:
+      GH_TOKEN: ${{ secrets.GH_TOKEN }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 22
+          registry-url: https://registry.npmjs.org/
+      - uses: bduff9/[email protected]
+        with:
+          dot-npmrc: ${{ secrets.DOT_NPMRC }}
+      - run: npm ci
+      - run: npm run build-mac_default
+
+  mac_default_universal-build:
+    runs-on: macos-latest
+    env:
+      GH_TOKEN: ${{ secrets.GH_TOKEN }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 22
+          registry-url: https://registry.npmjs.org/
+      - uses: bduff9/[email protected]
+        with:
+          dot-npmrc: ${{ secrets.DOT_NPMRC }}
+      - run: npm ci
+      - run: npm run build-mac_default_universal
+
+  mac_dmg-build:
+    runs-on: macos-latest
+    env:
+      GH_TOKEN: ${{ secrets.GH_TOKEN }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 22
+          registry-url: https://registry.npmjs.org/
+      - uses: bduff9/[email protected]
+        with:
+          dot-npmrc: ${{ secrets.DOT_NPMRC }}
+      - run: npm ci
+      - run: npm run build-mac_dmg
+
+  mac_dmg_universal-build:
+    runs-on: macos-latest
+    env:
+      GH_TOKEN: ${{ secrets.GH_TOKEN }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 22
+          registry-url: https://registry.npmjs.org/
+      - uses: bduff9/[email protected]
+        with:
+          dot-npmrc: ${{ secrets.DOT_NPMRC }}
+      - run: npm ci
+      - run: npm run build-mac_dmg_universal
+
   mac_pkg_arm64-build:
     runs-on: macos-latest
     env:

diff --git a/mac_default.json b/mac_default.json
@@ -0,0 +1,29 @@
+{
+    "appId": "cn.cnoctave.marked_reader",
+    "productName": "marked_reader",
+    "buildNumber": "1.2.0",
+    "icon": "logo.png",
+    "directories": {
+        "output": "dist"
+    },
+    "publish": [
+        {
+        "provider": "github",
+        "owner": "CNOCTAVE",
+        "repo": "marked_reader",
+        "releaseType": "release"
+        }
+    ],
+    "mac": {
+        "artifactName": "${name}-${version}-${os}-${arch}.${ext}",
+        "target": [
+            {
+                "target": "default",
+                "arch": [
+                    "x64",
+                    "arm64"
+                ]
+            }
+        ]
+    }
+}
diff --git a/mac_default_universal.json b/mac_default_universal.json
@@ -0,0 +1,28 @@
+{
+    "appId": "cn.cnoctave.marked_reader",
+    "productName": "marked_reader",
+    "buildNumber": "1.2.0",
+    "icon": "logo.png",
+    "directories": {
+        "output": "dist"
+    },
+    "publish": [
+        {
+        "provider": "github",
+        "owner": "CNOCTAVE",
+        "repo": "marked_reader",
+        "releaseType": "release"
+        }
+    ],
+    "mac": {
+        "artifactName": "${name}-${version}-${os}-${arch}.${ext}",
+        "target": [
+            {
+                "target": "default",
+                "arch": [
+                    "universal"
+                ]
+            }
+        ]
+    }
+}
diff --git a/mac_dmg.json b/mac_dmg.json
@@ -0,0 +1,29 @@
+{
+    "appId": "cn.cnoctave.marked_reader",
+    "productName": "marked_reader",
+    "buildNumber": "1.2.0",
+    "icon": "logo.png",
+    "directories": {
+        "output": "dist"
+    },
+    "publish": [
+        {
+        "provider": "github",
+        "owner": "CNOCTAVE",
+        "repo": "marked_reader",
+        "releaseType": "release"
+        }
+    ],
+    "mac": {
+        "artifactName": "${name}-${version}-${os}-${arch}.${ext}",
+        "target": [
+            {
+                "target": "dmg",
+                "arch": [
+                    "x64",
+                    "arm64"
+                ]
+            }
+        ]
+    }
+}
diff --git a/mac_dmg_universal.json b/mac_dmg_universal.json
@@ -0,0 +1,28 @@
+{
+    "appId": "cn.cnoctave.marked_reader",
+    "productName": "marked_reader",
+    "buildNumber": "1.2.0",
+    "icon": "logo.png",
+    "directories": {
+        "output": "dist"
+    },
+    "publish": [
+        {
+        "provider": "github",
+        "owner": "CNOCTAVE",
+        "repo": "marked_reader",
+        "releaseType": "release"
+        }
+    ],
+    "mac": {
+        "artifactName": "${name}-${version}-${os}-${arch}.${ext}",
+        "target": [
+            {
+                "target": "dmg",
+                "arch": [
+                    "universal"
+                ]
+            }
+        ]
+    }
+}
diff --git a/mac_universal.json b/mac_universal.json
@@ -17,12 +17,6 @@
     "mac": {
         "artifactName": "${name}-${version}-${os}-${arch}.${ext}",
         "target": [
-            {
-                "target": "default",
-                "arch": [
-                    "universal"
-                ]
-            },
             {
                 "target": "tar.xz",
                 "arch": [
@@ -46,18 +40,6 @@
                 "arch": [
                     "universal"
                 ]
-            },
-            {
-                "target": "dmg",
-                "arch": [
-                    "universal"
-                ]
-            },
-            {
-                "target": "pkg",
-                "arch": [
-                    "universal"
-                ]
             }
         ]
     }

diff --git a/package.json b/package.json
@@ -24,6 +24,10 @@
         "build-mac_zip_universal": "electron-builder --mac --config mac_zip_universal.json",
         "build-mac_7z": "electron-builder --mac --config mac_7z.json",
         "build-mac_7z_universal": "electron-builder --mac --config mac_7z_universal.json",
+        "build-mac_default": "electron-builder --mac --config mac_default.json",
+        "build-mac_default_universal": "electron-builder --mac --config mac_default_universal.json",
+        "build-mac_dmg": "electron-builder --mac --config mac_dmg.json",
+        "build-mac_dmg_universal": "electron-builder --mac --config mac_dmg_universal.json",
         "build-mac_pkg_arm64": "electron-builder --mac --config mac_pkg_arm64.json",
         "build-mac_pkg_x64": "electron-builder --mac --config mac_pkg_x64.json",
         "build-mac_pkg_universal": "electron-builder --mac --config mac_pkg_universal.json",
@@ -129,13 +133,6 @@
         "mac": {
             "artifactName": "${name}-${version}-${os}-${arch}.${ext}",
             "target": [
-                {
-                    "target": "default",
-                    "arch": [
-                        "x64",
-                        "arm64"
-                    ]
-                },
                 {
                     "target": "tar.xz",
                     "arch": [
@@ -163,13 +160,6 @@
                         "x64",
                         "arm64"
                     ]
-                },
-                {
-                    "target": "dmg",
-                    "arch": [
-                        "x64",
-                        "arm64"
-                    ]
                 }
             ]
         },