diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 24a44847e2..b76ce2a572 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -104,8 +104,8 @@ jobs: - script: yarn test:e2e name: Test - - job: Package - condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/') + - job: Release + condition: eq(variables['build.sourceBranch'], 'refs/heads/master') pool: vmImage: 'macos-10.14' steps: @@ -127,8 +127,9 @@ jobs: displayName: 'Download Windows Signing Certificate' inputs: secureFile: Neuron_win.p12 - - script: yarn package - name: Build + - script: yarn release + name: Release + displayName: 'Sign and Release' env: CSC_LINK: $(macSiginingCertificate.secureFilePath) CSC_KEY_PASSWORD: $(macSiginingCertificatePassword) @@ -136,18 +137,4 @@ jobs: WIN_CSC_KEY_PASSWORD: $(winSiginingCertificatePassword) APPLE_ID: $(appleId) APPLE_ID_PASSWORD: $(appleIdPassword) - - task: GitHubRelease@0 - inputs: - gitHubConnection: nervos-bot - repositoryName: nervosnetwork/neuron - action: edit - tag: $(Build.SourceBranchName) - assets: | - $(Build.SourcesDirectory)/release/*.zip - $(Build.SourcesDirectory)/release/*.dmg - $(Build.SourcesDirectory)/release/*.exe - $(Build.SourcesDirectory)/release/*.deb - $(Build.SourcesDirectory)/release/*.AppImage - assetUploadMode: replace - isPreRelease: true - addChangeLog: false + GH_TOKEN: $(ghToken) diff --git a/package.json b/package.json index d66e67c53e..5cff0185be 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "clean": "lerna run --stream clean", "prebuild": "yarn clean", "build": "lerna run --stream build", - "package": "yarn build && ./scripts/copy-ui-files.sh && ./scripts/package.sh", + "release": "yarn build && ./scripts/copy-ui-files.sh && ./scripts/release.sh", "test": "lerna run --parallel test", "test:e2e": "yarn build && ./scripts/copy-ui-files.sh && lerna run --parallel test:e2e", "lint": "lerna run --stream lint", diff --git a/packages/neuron-wallet/electron-builder.yml b/packages/neuron-wallet/electron-builder.yml index 95baa45b15..4db8d52eae 100644 --- a/packages/neuron-wallet/electron-builder.yml +++ b/packages/neuron-wallet/electron-builder.yml @@ -29,6 +29,9 @@ files: - from: "../../node_modules/escape-string-regexp" to: "node_modules/escape-string-regexp" +publish: + - github + nsis: oneClick: false createDesktopShortcut: always diff --git a/scripts/package.sh b/scripts/package.sh deleted file mode 100755 index 7585e8165c..0000000000 --- a/scripts/package.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -function package() { - case $1 in - mac) - electron-builder --mac - ;; - win) - electron-builder --win --x64 - ;; - linux) - electron-builder --linux - ;; - *) - electron-builder -mwl - ;; - esac -} - -cd packages/neuron-wallet/ -package $1 diff --git a/scripts/release.sh b/scripts/release.sh new file mode 100755 index 0000000000..50823104a1 --- /dev/null +++ b/scripts/release.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +function release() { + case $1 in + mac) + electron-builder --mac -p always + ;; + win) + electron-builder --win --x64 -p always + ;; + linux) + electron-builder --linux -p always + ;; + *) + electron-builder -mwl -p always + ;; + esac +} + +cd packages/neuron-wallet/ +release $1