ci: build electron app for armv7l and arm64

cncjs · Apr 24, 2021 · f834b1b · f834b1b
1 parent e063ed6
commit f834b1b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -205,7 +205,7 @@ for:
             yarn build:linux-armv7l
             ls -al output output/*
             mkdir -p releases/linux
-            cp -af "output/${PACKAGE_NAME}-${PACKAGE_VERSION}.aarch32.rpm" "releases/linux/${PACKAGE_NAME}-${PACKAGE_VERSION}-linux.aarch32.rpm"
+            cp -af "output/${PACKAGE_NAME}-${PACKAGE_VERSION}.armv7l.rpm" "releases/linux/${PACKAGE_NAME}-${PACKAGE_VERSION}-linux.armv7l.rpm"
             cp -af "output/${PRODUCT_NAME}-${PACKAGE_VERSION}-armv7l.AppImage" "releases/linux/${PACKAGE_NAME}-${PACKAGE_VERSION}-linux-armv7l.AppImage"
             cp -af "output/${PACKAGE_NAME}_${PACKAGE_VERSION}_armv7l.deb" "releases/linux/${PACKAGE_NAME}-${PACKAGE_VERSION}-linux-armv7l.deb"
             pushd releases/linux
@@ -220,7 +220,7 @@ for:
                 --repo=cncjs \
                 --tag="${CI_BRANCH}-latest" \
                 --release-name="${CI_BRANCH}" \
-                "*-linux.aarch32.rpm" \
+                "*-linux.armv7l.rpm" \
                 "*-linux-armv7l.AppImage" \
                 "*-linux-armv7l.deb" \
                 "*-linux-armv7l.tar.gz";
@@ -230,11 +230,11 @@ for:
                 --tag="${CI_BRANCH}-latest" \
                 --release-name="${CI_BRANCH}" \
                 --body="${GIT_COMMIT_LOG}" \
-                "releases/linux/${PACKAGE_NAME}-${PACKAGE_VERSION}-linux.aarch32.rpm" \
+                "releases/linux/${PACKAGE_NAME}-${PACKAGE_VERSION}-linux.armv7l.rpm" \
                 "releases/linux/${PACKAGE_NAME}-${PACKAGE_VERSION}-linux-armv7l.AppImage" \
                 "releases/linux/${PACKAGE_NAME}-${PACKAGE_VERSION}-linux-armv7l.deb" \
                 "releases/linux/${PACKAGE_NAME}-${PACKAGE_VERSION}-linux-armv7l.tar.gz";
-              rm -f "releases/linux/${PACKAGE_NAME}-${PACKAGE_VERSION}-linux.aarch32.rpm";
+              rm -f "releases/linux/${PACKAGE_NAME}-${PACKAGE_VERSION}-linux.armv7l.rpm";
               rm -f "releases/linux/${PACKAGE_NAME}-${PACKAGE_VERSION}-linux-armv7l.AppImage";
               rm -f "releases/linux/${PACKAGE_NAME}-${PACKAGE_VERSION}-linux-armv7l.deb";
               rm -f "releases/linux/${PACKAGE_NAME}-${PACKAGE_VERSION}-linux-armv7l.tar.gz";
@@ -250,7 +250,7 @@ for:
             yarn build:linux-arm64
             ls -al output output/*
             mkdir -p releases/linux
-            cp -af "output/${PACKAGE_NAME}-${PACKAGE_VERSION}.aarch64.rpm" "releases/linux/${PACKAGE_NAME}-${PACKAGE_VERSION}-linux.aarch64.rpm"
+            cp -af "output/${PACKAGE_NAME}-${PACKAGE_VERSION}.arm64.rpm" "releases/linux/${PACKAGE_NAME}-${PACKAGE_VERSION}-linux.arm64.rpm"
             cp -af "output/${PRODUCT_NAME}-${PACKAGE_VERSION}-arm64.AppImage" "releases/linux/${PACKAGE_NAME}-${PACKAGE_VERSION}-linux-arm64.AppImage"
             cp -af "output/${PACKAGE_NAME}_${PACKAGE_VERSION}_arm64.deb" "releases/linux/${PACKAGE_NAME}-${PACKAGE_VERSION}-linux-arm64.deb"
             pushd releases/linux
@@ -265,7 +265,7 @@ for:
                 --repo=cncjs \
                 --tag="${CI_BRANCH}-latest" \
                 --release-name="${CI_BRANCH}" \
-                "*-linux.aarch64.rpm" \
+                "*-linux.arm64.rpm" \
                 "*-linux-arm64.AppImage" \
                 "*-linux-arm64.deb" \
                 "*-linux-arm64.tar.gz";
@@ -275,11 +275,11 @@ for:
                 --tag="${CI_BRANCH}-latest" \
                 --release-name="${CI_BRANCH}" \
                 --body="${GIT_COMMIT_LOG}" \
-                "releases/linux/${PACKAGE_NAME}-${PACKAGE_VERSION}-linux.aarch64.rpm" \
+                "releases/linux/${PACKAGE_NAME}-${PACKAGE_VERSION}-linux.arm64.rpm" \
                 "releases/linux/${PACKAGE_NAME}-${PACKAGE_VERSION}-linux-arm64.AppImage" \
                 "releases/linux/${PACKAGE_NAME}-${PACKAGE_VERSION}-linux-arm64.deb" \
                 "releases/linux/${PACKAGE_NAME}-${PACKAGE_VERSION}-linux-arm64.tar.gz";
-              rm -f "releases/linux/${PACKAGE_NAME}-${PACKAGE_VERSION}-linux.aarch64.rpm";
+              rm -f "releases/linux/${PACKAGE_NAME}-${PACKAGE_VERSION}-linux.arm64.rpm";
               rm -f "releases/linux/${PACKAGE_NAME}-${PACKAGE_VERSION}-linux-arm64.AppImage";
               rm -f "releases/linux/${PACKAGE_NAME}-${PACKAGE_VERSION}-linux-arm64.deb";
               rm -f "releases/linux/${PACKAGE_NAME}-${PACKAGE_VERSION}-linux-arm64.tar.gz";

diff --git a/package.json b/package.json
@@ -47,12 +47,13 @@
     "electron-rebuild": "electron-rebuild",
     "github-release": "github-release",
     "package-sync": "node scripts/package-sync.js",
-    "build:mac-x64": "bash -c 'scripts/electron-builder.sh --mac --x64'",
+    "build:macos-x64": "bash -c 'scripts/electron-builder.sh --macos --x64'",
     "build:linux-ia32": "bash -c 'scripts/electron-builder.sh --linux --ia32'",
     "build:linux-x64": "bash -c 'scripts/electron-builder.sh --linux --x64'",
     "build:linux-armv7l": "bash -c 'scripts/electron-builder.sh --linux --armv7l'",
-    "build:win-ia32": "bash -c 'scripts/electron-builder.sh --win --ia32'",
-    "build:win-x64": "bash -c 'scripts/electron-builder.sh --win --x64'",
+    "build:linux-arm64": "bash -c 'scripts/electron-builder.sh --linux --arm64'",
+    "build:windows-ia32": "bash -c 'scripts/electron-builder.sh --windows --ia32'",
+    "build:windows-x64": "bash -c 'scripts/electron-builder.sh --windows --x64'",
     "start-electron": "electron ./dist/cncjs/main",
     "start-prod": "npm run build-prod && NODE_ENV=production ./bin/cncjs",
     "dev": "npm run build-dev && concurrently --names \"start-app-dev,start-server-dev\" \"npm run start-app-dev\" \"npm run start-server-dev\"",