From 0cf939c7aba296f67f19c43df8b8c84e95110870 Mon Sep 17 00:00:00 2001 From: Cheton Wu Date: Sat, 24 Apr 2021 11:49:33 +0800 Subject: [PATCH] chore: use fullname for the build target --- appveyor.yml | 8 +++----- package.json | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index b941439a2..17c981ad4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -49,7 +49,6 @@ for: init: - uname -a - - uname -i - git --version - git config --global core.autocrlf false - git config --global user.name "AppVeyor" @@ -315,7 +314,6 @@ for: init: - uname -a - - uname -i - git --version - git config --global core.autocrlf false - git config --global user.name "AppVeyor" @@ -361,7 +359,7 @@ for: PACKAGE_NAME=`node -e "console.log(require('./src/package.json').name)"` PACKAGE_VERSION=`node -e "console.log(require('./src/package.json').version)"` PRODUCT_NAME=CNCjs - yarn build:mac-x64 + yarn build:macos-x64 ls -al output output/* mkdir -p releases/macos cp -af "output/${PRODUCT_NAME}-${PACKAGE_VERSION}.dmg" "releases/macos/${PACKAGE_NAME}-${PACKAGE_VERSION}-macos.x64.dmg" @@ -456,7 +454,7 @@ for: $PACKAGE_VERSION = node -e "console.log(require('./src/package.json').version)" $PRODUCT_NAME = "CNCjs" mkdir -Force -Path releases\windows - yarn build:win-x64 + yarn build:windows-x64 Get-ChildItem output Copy-Item "output\${PRODUCT_NAME} Setup ${PACKAGE_VERSION}.exe" "releases\windows\${PACKAGE_NAME}-${PACKAGE_VERSION}-windows-x64.exe" Get-ChildItem releases\windows @@ -473,7 +471,7 @@ for: $PACKAGE_VERSION = node -e "console.log(require('./src/package.json').version)" $PRODUCT_NAME = "CNCjs" mkdir -Force -Path releases\windows - yarn build:win-ia32 + yarn build:windows-ia32 Get-ChildItem output Copy-Item "output\${PRODUCT_NAME} Setup ${PACKAGE_VERSION}.exe" "releases\windows\${PACKAGE_NAME}-${PACKAGE_VERSION}-windows-x86.exe" Get-ChildItem releases\windows diff --git a/package.json b/package.json index 5d965ab1d..828146bc7 100644 --- a/package.json +++ b/package.json @@ -47,13 +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:linux-arm64": "bash -c 'scripts/electron-builder.sh --linux --arm64'", - "build:win-ia32": "bash -c 'scripts/electron-builder.sh --win --ia32'", - "build:win-x64": "bash -c 'scripts/electron-builder.sh --win --x64'", + "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\"",