From 5e2ec1a9bf3c1d5a9678f4895d552510fb85bc3a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2019 19:16:42 +0000 Subject: [PATCH 01/16] [Security] Bump eslint-utils from 1.3.1 to 1.4.2 Bumps [eslint-utils](https://github.com/mysticatea/eslint-utils) from 1.3.1 to 1.4.2. **This update includes a security fix.** - [Release notes](https://github.com/mysticatea/eslint-utils/releases) - [Commits](https://github.com/mysticatea/eslint-utils/compare/v1.3.1...v1.4.2) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/yarn.lock b/yarn.lock index c6edabd5..841b49fb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2137,14 +2137,16 @@ eslint-scope@^4.0.0, eslint-scope@^4.0.3: estraverse "^4.1.1" eslint-utils@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.3.1.tgz#9a851ba89ee7c460346f97cf8939c7298827e512" - integrity sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q== + version "1.4.2" + resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.2.tgz#166a5180ef6ab7eb462f162fd0e6f2463d7309ab" + integrity sha512-eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q== + dependencies: + eslint-visitor-keys "^1.0.0" eslint-visitor-keys@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d" - integrity sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ== + version "1.1.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2" + integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A== eslint@^5.16.0: version "5.16.0" From 3c2af3045d127718a850695e543ce03a2ccdf437 Mon Sep 17 00:00:00 2001 From: Eugene Date: Mon, 26 Aug 2019 22:03:36 +0200 Subject: [PATCH 02/16] Create docs.yml --- .github/workflows/docs.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/docs.yml diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml new file mode 100644 index 00000000..69be3bfa --- /dev/null +++ b/.github/workflows/docs.yml @@ -0,0 +1,26 @@ +name: Docs +on: push +jobs: + build: + runs-on: ubuntu-18.04 + + steps: + - name: Checkout + uses: actions/checkout@v1 + + - name: Installing Node + uses: actions/setup-node@v1 + with: + version: 10 + + - name: Build + run: | + apt-get install openssh-client + npm i -g yarn + ssh-add <(echo "$DOCS_PRIVATE_KEY") + yarn + yarn run docs + rsync -e "ssh -o StrictHostKeyChecking=no" -arv docs/api/ root@ajenti.org:/srv/terminus-docs/ + + env: + DOCS_PRIVATE_KEY: ${{ secrets.DOCS_PRIVATE_KEY }} From f244f0936286fb443c54319f44c7372796535373 Mon Sep 17 00:00:00 2001 From: Eugene Date: Mon, 26 Aug 2019 22:06:20 +0200 Subject: [PATCH 03/16] Update docs.yml --- .github/workflows/docs.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 69be3bfa..c7f707b6 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -15,8 +15,6 @@ jobs: - name: Build run: | - apt-get install openssh-client - npm i -g yarn ssh-add <(echo "$DOCS_PRIVATE_KEY") yarn yarn run docs From 2a1501c91ef2142bae7a39faf04e6cac85be0a5d Mon Sep 17 00:00:00 2001 From: Eugene Date: Mon, 26 Aug 2019 22:08:00 +0200 Subject: [PATCH 04/16] Update docs.yml --- .github/workflows/docs.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index c7f707b6..e93d7e30 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -15,6 +15,7 @@ jobs: - name: Build run: | + eval $(ssh-agent -s) ssh-add <(echo "$DOCS_PRIVATE_KEY") yarn yarn run docs From e0f05654f72b9c1270ded384f39fb50d32deb066 Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Mon, 26 Aug 2019 22:14:10 +0200 Subject: [PATCH 05/16] ci --- .github/workflows/macos.yml | 12 +++++++++++- build/travis.sh | 12 ------------ 2 files changed, 11 insertions(+), 13 deletions(-) delete mode 100755 build/travis.sh diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index a341b3f0..006f669a 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -14,7 +14,17 @@ jobs: version: 10 - name: Build - run: build/travis.sh + run: | + cd app + yarn + cd .. + rm app/node_modules/.yarn-integrity + yarn + scripts/build-native.js + yarn run build:typings + yarn run build + scripts/prepackage-plugins.js + scripts/build-macos.js env: GH_TOKEN: ${{ secrets.GH_TOKEN }} BT_TOKEN: ${{ secrets.BT_TOKEN }} diff --git a/build/travis.sh b/build/travis.sh deleted file mode 100755 index ae5e23f2..00000000 --- a/build/travis.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -set -e -cd app -yarn -cd .. -rm app/node_modules/.yarn-integrity -yarn -scripts/build-native.js -yarn run build:typings -yarn run build -scripts/prepackage-plugins.js -scripts/build-macos.js From c63c7dae3faa4ed3deba42b36011457deb282f0e Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Mon, 26 Aug 2019 22:21:23 +0200 Subject: [PATCH 06/16] ci --- .github/workflows/linux.yml | 66 +++++++++++++++++++++++++++++++++++++ .github/workflows/macos.yml | 1 + 2 files changed, 67 insertions(+) create mode 100644 .github/workflows/linux.yml diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml new file mode 100644 index 00000000..8c720f91 --- /dev/null +++ b/.github/workflows/linux.yml @@ -0,0 +1,66 @@ +name: Linux Build +on: [push, pull_request] +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v1 + + - name: Installing Node + uses: actions/setup-node@v1 + with: + version: 10 + + - name: Build + run: | + cd app + yarn + cd .. + rm app/node_modules/.yarn-integrity + yarn + yarn run lint + scripts/build-native.js + yarn run build:typings + yarn run build + scripts/prepackage-plugins.js + scripts/build-linux.js + env: + GH_TOKEN: ${{ secrets.GH_TOKEN }} + BT_TOKEN: ${{ secrets.BT_TOKEN }} + + - name: Package artifacts + run: | + mkdir artifact-deb + mv dist/*.pkg artifact-deb/ + mkdir artifact-rpm + mv dist/*.zip artifact-rpm/ + mkdir artifact-snap + mv dist/*.zip artifact-snap/ + mkdir artifact-tar.gz + mv dist/*.zip artifact-tar.gz/ + + - uses: actions/upload-artifact@master + name: Upload DEB + with: + name: Linux .deb + path: artifact-deb + + - uses: actions/upload-artifact@master + name: Upload RPM + with: + name: Linux .rpm + path: artifact-rpm + + - uses: actions/upload-artifact@master + name: Upload Snap + with: + name: Linux .snap + path: artifact-snap + + - uses: actions/upload-artifact@master + name: Upload tarball + with: + name: Linux tarball + path: artifact-tar.gz diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 006f669a..4d442e5b 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -20,6 +20,7 @@ jobs: cd .. rm app/node_modules/.yarn-integrity yarn + yarn run lint scripts/build-native.js yarn run build:typings yarn run build From 927ca57e5634b965a27bd243070a130c437636de Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Mon, 26 Aug 2019 22:38:13 +0200 Subject: [PATCH 07/16] ci --- .github/workflows/linux.yml | 8 +++--- .github/workflows/windows.yml | 51 +++++++++++++++++++++++++++++++++++ scripts/build-linux.js | 2 +- scripts/build-windows.js | 2 +- 4 files changed, 57 insertions(+), 6 deletions(-) create mode 100644 .github/workflows/windows.yml diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 8c720f91..66c2f1ee 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -33,13 +33,13 @@ jobs: - name: Package artifacts run: | mkdir artifact-deb - mv dist/*.pkg artifact-deb/ + mv dist/*.deb artifact-deb/ mkdir artifact-rpm - mv dist/*.zip artifact-rpm/ + mv dist/*.rpm artifact-rpm/ mkdir artifact-snap - mv dist/*.zip artifact-snap/ + mv dist/*.snap artifact-snap/ mkdir artifact-tar.gz - mv dist/*.zip artifact-tar.gz/ + mv dist/*.tar.gz artifact-tar.gz/ - uses: actions/upload-artifact@master name: Upload DEB diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml new file mode 100644 index 00000000..24844166 --- /dev/null +++ b/.github/workflows/windows.yml @@ -0,0 +1,51 @@ +name: Windows Build +on: [push, pull_request] +jobs: + build: + runs-on: windows-latest + + steps: + - name: Checkout + uses: actions/checkout@v1 + + - name: Installing Node + uses: actions/setup-node@v1 + with: + version: 10 + + - name: Build + run: | + cd app + yarn + cd .. + rm app/node_modules/.yarn-integrity + yarn + yarn run lint + scripts/build-native.js + yarn run build:typings + yarn run build + scripts/prepackage-plugins.js + scripts/build-windows.js + env: + GH_TOKEN: ${{ secrets.GH_TOKEN }} + BT_TOKEN: ${{ secrets.BT_TOKEN }} + WIN_CSC_LINK: ${{ secrets.WIN_CSC_LINK }} + + - name: Package artifacts + run: | + mkdir artifact-setup + mv dist/*-setup.exe artifact-setup/ + mkdir artifact-portable + mv dist/*-portable.exe artifact-portable/ + + - uses: actions/upload-artifact@master + name: Upload installer + with: + name: Installer + path: artifact-setup + + - uses: actions/upload-artifact@master + name: Upload portable build + with: + name: Portable build + path: artifact-portable diff --git a/scripts/build-linux.js b/scripts/build-linux.js index 6b87f915..eb6fb740 100755 --- a/scripts/build-linux.js +++ b/scripts/build-linux.js @@ -2,7 +2,7 @@ const builder = require('electron-builder').build const vars = require('./vars') -const isTag = (process.env.BUILD_SOURCEBRANCH || '').startsWith('refs/tags/') +const isTag = (process.env.GITHUB_REF || '').startsWith('refs/tags/') builder({ dir: true, diff --git a/scripts/build-windows.js b/scripts/build-windows.js index df741477..eb6ab2fb 100755 --- a/scripts/build-windows.js +++ b/scripts/build-windows.js @@ -2,7 +2,7 @@ const builder = require('electron-builder').build const vars = require('./vars') -const isTag = (process.env.BUILD_SOURCEBRANCH || '').startsWith('refs/tags/') +const isTag = (process.env.GITHUB_REF || '').startsWith('refs/tags/') builder({ dir: true, From 3421a8e19ff152973a604047aa285c9fa946e260 Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Mon, 26 Aug 2019 22:49:18 +0200 Subject: [PATCH 08/16] Update windows.yml --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 24844166..b3e95c4b 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -2,7 +2,7 @@ name: Windows Build on: [push, pull_request] jobs: build: - runs-on: windows-latest + runs-on: windows-2016 steps: - name: Checkout From 4f0daf7a779592704bfc1c8b8b149531984be56b Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Mon, 26 Aug 2019 22:55:20 +0200 Subject: [PATCH 09/16] Update windows.yml --- .github/workflows/windows.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index b3e95c4b..f3b19a9b 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -14,18 +14,19 @@ jobs: version: 10 - name: Build + shell: powershell run: | cd app yarn cd .. - rm app/node_modules/.yarn-integrity + del app/node_modules/.yarn-integrity yarn yarn run lint - scripts/build-native.js + node scripts/build-native.js yarn run build:typings yarn run build - scripts/prepackage-plugins.js - scripts/build-windows.js + node scripts/prepackage-plugins.js + node scripts/build-windows.js env: GH_TOKEN: ${{ secrets.GH_TOKEN }} BT_TOKEN: ${{ secrets.BT_TOKEN }} From 1d3333e83bd25dc65e275f261e2fb8a23fa5f4fa Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Mon, 26 Aug 2019 23:09:55 +0200 Subject: [PATCH 10/16] Update windows.yml --- .github/workflows/windows.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index f3b19a9b..f99e4def 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -21,7 +21,6 @@ jobs: cd .. del app/node_modules/.yarn-integrity yarn - yarn run lint node scripts/build-native.js yarn run build:typings yarn run build From 2844f699ff51f4c30909e017dff89d3994a2038e Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Mon, 26 Aug 2019 23:26:56 +0200 Subject: [PATCH 11/16] ci --- .github/workflows/windows.yml | 1 + .travis.ssh.key.enc | Bin 3392 -> 0 bytes .travis.ssh.key.pub | 1 - azure-pipelines.yml | 210 ---------------------------------- 4 files changed, 1 insertion(+), 211 deletions(-) delete mode 100644 .travis.ssh.key.enc delete mode 100644 .travis.ssh.key.pub delete mode 100644 azure-pipelines.yml diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index f99e4def..0b2cf2a3 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -30,6 +30,7 @@ jobs: GH_TOKEN: ${{ secrets.GH_TOKEN }} BT_TOKEN: ${{ secrets.BT_TOKEN }} WIN_CSC_LINK: ${{ secrets.WIN_CSC_LINK }} + WIN_CSC_KEY_PASSWORD: ${{ secrets.WIN_CSC_KEY_PASSWORD }} - name: Package artifacts run: | diff --git a/.travis.ssh.key.enc b/.travis.ssh.key.enc deleted file mode 100644 index 5f07ddbfb5ea6a87aa051b24ead04f07bc834091..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3392 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 W2adQ}T!qTGB>~@V1dO9Gf*&HR>#%45 diff --git a/.travis.ssh.key.pub b/.travis.ssh.key.pub deleted file mode 100644 index e534803e..00000000 --- a/.travis.ssh.key.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDDFM4nHSbET5V7EYNgjA8NeVfOxV0wVMdZ2YvsDzD+qPJ4+MYbvsL7ZPaSxQSn7n6ATkLHjKje5RpF/Rl9K3kucGs0P6cqJVeE0qryEteQ3Q+fYAk+bD2J9ZQ/hv/0NtLl8T+7lJUZ3WUxFH73sgph77Sw0z+kMpPaK7U2vqMBQD/7+6iJgya31wP0qW0XKDz1BjKeXgwTg10Pm4vcGsR4c2q7YIzSzBHffcyo0vJyFvOX/ZKHlZRcq/wnQMeOl/hPgf1xCENjQZmFVReQlYSw5cNNDT9HZPKekOAZFFez7/AbPiTIo/bnBYIv0mdUjr3nw8nXF505q8LiD3z/ksaaWDqe9CCLM4W0Bh7/dhP7IGPdfX0fVHLhOnYIOsG21D8rWJjMPkVRSLyEvWNAnVuObJNHoQu8VATnOxfPNnMun72IHyyFWVoADk5JcsMbzcP7gZB+5oJO7U1qpcdndtBOA3ZlF0Uz2jVZnqavoEBWT39tl3vs69hAA3aTPGclg7HMuAJOl4HsKmaUgDxqV2wCX/S4pDqmKMbmumDLX+MM0xl0gXj/zpVJp9BzdnrArkC40ivmC6TSA4wrdN0tNBlqApkH5/jxGWrcu2AXVn9PGF3+QrjW0iu+QMZCaKWDhLIQC835uFwzhnNGlx41B7uxMLuNFxKXdQ3f/cC9QMG8ew== TravisCIDeployKey diff --git a/azure-pipelines.yml b/azure-pipelines.yml deleted file mode 100644 index ebd1bfe4..00000000 --- a/azure-pipelines.yml +++ /dev/null @@ -1,210 +0,0 @@ -trigger: - tags: - include: - - v* - branches: - include: - - master - -variables: -- group: Vars - -jobs: -# - job: Windows -# pool: -# vmImage: 'vs2017-win2016' - -# steps: -# - task: NodeTool@0 -# inputs: -# versionSpec: '10.x' -# displayName: 'Install Node.js' - -# - script: yarn --network-timeout 100000 -# displayName: 'Install dependencies' - -# - script: node scripts/build-native.js -# displayName: 'Rebuild native dependencies' - -# - script: yarn run build -# displayName: 'Build' - -# - script: node scripts/prepackage-plugins.js -# displayName: 'Prepackage plugins' - -# - script: node scripts/build-windows.js -# displayName: 'Package' -# env: -# WIN_CSC_LINK: $(WIN_CSC_LINK) -# WIN_CSC_KEY_PASSWORD: $(WIN_CSC_KEY_PASSWORD) -# BT_TOKEN: $(BT_TOKEN) -# GH_TOKEN: $(GH_TOKEN) -# DEBUG: electron-builder - -# - task: CopyFiles@2 -# inputs: -# contents: 'dist\\*-setup.exe' -# targetFolder: $(Build.ArtifactStagingDirectory) -# flattenFolders: true -# cleanTargetFolder: true - -# - task: PublishBuildArtifacts@1 -# inputs: -# pathtoPublish: $(Build.ArtifactStagingDirectory) -# artifactName: Windows - Installer -# condition: eq(variables['Build.SourceBranch'], 'refs/heads/master') - -# - task: CopyFiles@2 -# inputs: -# contents: 'dist\\*-portable.exe' -# targetFolder: $(Build.ArtifactStagingDirectory) -# flattenFolders: true -# cleanTargetFolder: true - -# - task: PublishBuildArtifacts@1 -# inputs: -# pathtoPublish: $(Build.ArtifactStagingDirectory) -# artifactName: Windows - Portable build -# condition: eq(variables['Build.SourceBranch'], 'refs/heads/master') - -- job: Linux - pool: - vmImage: 'ubuntu-16.04' - - steps: - - task: NodeTool@0 - inputs: - versionSpec: '10.x' - displayName: 'Install Node.js' - - - script: yarn - displayName: 'Install dependencies' - - - script: node scripts/build-native.js - displayName: 'Rebuild native dependencies' - - - script: yarn run build - displayName: 'Build' - - - script: yarn run lint - displayName: 'Lint' - - - script: node scripts/prepackage-plugins.js - displayName: 'Prepackage plugins' - - - script: node scripts/build-linux.js - displayName: 'Package' - env: - BT_TOKEN: $(BT_TOKEN) - GH_TOKEN: $(GH_TOKEN) - - - task: CopyFiles@2 - inputs: - contents: 'dist/*.deb' - targetFolder: $(Build.ArtifactStagingDirectory) - flattenFolders: true - cleanTargetFolder: true - - - task: PublishBuildArtifacts@1 - inputs: - pathtoPublish: $(Build.ArtifactStagingDirectory) - artifactName: Linux - DEB - condition: eq(variables['Build.SourceBranch'], 'refs/heads/master') - - - task: CopyFiles@2 - inputs: - contents: 'dist/*.rpm' - targetFolder: $(Build.ArtifactStagingDirectory) - flattenFolders: true - cleanTargetFolder: true - - - task: PublishBuildArtifacts@1 - inputs: - pathtoPublish: $(Build.ArtifactStagingDirectory) - artifactName: Linux - RPM - condition: eq(variables['Build.SourceBranch'], 'refs/heads/master') - - - task: CopyFiles@2 - inputs: - contents: 'dist/*.snap' - targetFolder: $(Build.ArtifactStagingDirectory) - flattenFolders: true - cleanTargetFolder: true - - - task: PublishBuildArtifacts@1 - inputs: - pathtoPublish: $(Build.ArtifactStagingDirectory) - artifactName: Linux - Snap - condition: eq(variables['Build.SourceBranch'], 'refs/heads/master') - - - task: CopyFiles@2 - inputs: - contents: 'dist/*.tar.gz' - targetFolder: $(Build.ArtifactStagingDirectory) - flattenFolders: true - cleanTargetFolder: true - - - task: PublishBuildArtifacts@1 - inputs: - pathtoPublish: $(Build.ArtifactStagingDirectory) - artifactName: Linux - tar.gz - condition: eq(variables['Build.SourceBranch'], 'refs/heads/master') - -# - job: macOS -# pool: -# vmImage: 'macOS-10.14' - -# steps: -# - task: NodeTool@0 -# inputs: -# versionSpec: '10.x' -# displayName: 'Install Node.js' - -# - script: yarn -# displayName: 'Install dependencies' - -# - script: node scripts/build-native.js -# displayName: 'Rebuild native dependencies' - -# - script: yarn run build -# displayName: 'Build' - -# - script: node scripts/prepackage-plugins.js -# displayName: 'Prepackage plugins' - -# - script: node scripts/build-macos.js -# displayName: 'Package' -# env: -# CSC_LINK: $(CSC_LINK) -# CSC_KEY_PASSWORD: $(CSC_KEY_PASSWORD) -# BT_TOKEN: $(BT_TOKEN) -# GH_TOKEN: $(GH_TOKEN) -# APPSTORE_USERNAME: $(APPSTORE_USERNAME) -# APPSTORE_PASSWORD: $(APPSTORE_PASSWORD) -# DEBUG: electron-builder - -# - task: CopyFiles@2 -# inputs: -# contents: 'dist/*.dmg' -# targetFolder: $(Build.ArtifactStagingDirectory) -# flattenFolders: true -# cleanTargetFolder: true - -# - task: PublishBuildArtifacts@1 -# inputs: -# pathtoPublish: $(Build.ArtifactStagingDirectory) -# artifactName: macOS - DMG -# condition: eq(variables['Build.SourceBranch'], 'refs/heads/master') - -# - task: CopyFiles@2 -# inputs: -# contents: 'dist/*.zip' -# targetFolder: $(Build.ArtifactStagingDirectory) -# flattenFolders: true -# cleanTargetFolder: true - -# - task: PublishBuildArtifacts@1 -# inputs: -# pathtoPublish: $(Build.ArtifactStagingDirectory) -# artifactName: macOS - app.zip -# condition: eq(variables['Build.SourceBranch'], 'refs/heads/master') From 3bc387b1d991fc2c0cf70b6c663b25e20e6447f1 Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Mon, 26 Aug 2019 23:42:34 +0200 Subject: [PATCH 12/16] Delete appveyor.yml --- appveyor.yml | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 appveyor.yml diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index c67fc192..00000000 --- a/appveyor.yml +++ /dev/null @@ -1,28 +0,0 @@ -os: Visual Studio 2017 - -platform: - - x64 - -environment: - nodejs_version: "10" - -version: "{build}" - -install: - - ps: Install-Product node $env:nodejs_version $env:platform - - yarn - - node scripts/build-native.js - -build_script: - - yarn run build - - node scripts/prepackage-plugins.js - - node scripts/build-windows.js - -artifacts: - - path: 'dist\*.exe' - -cache: - - node_modules - - "*\\node_modules" - - "%USERPROFILE%\\.electron" - - "%LOCALAPPDATA%\\Yarn" From bd713f8e07355c056ee4accf669de2efbc7c50c6 Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Mon, 26 Aug 2019 23:52:20 +0200 Subject: [PATCH 13/16] ci --- scripts/build-linux.js | 9 ++++++++- scripts/build-macos.js | 9 ++++++++- scripts/build-windows.js | 9 ++++++++- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/scripts/build-linux.js b/scripts/build-linux.js index eb6fb740..654a9f3d 100755 --- a/scripts/build-linux.js +++ b/scripts/build-linux.js @@ -3,14 +3,21 @@ const builder = require('electron-builder').build const vars = require('./vars') const isTag = (process.env.GITHUB_REF || '').startsWith('refs/tags/') +const isCI = !!process.env.GITHUB_REF builder({ dir: true, linux: ['snap', 'deb', 'rpm', 'tar.gz'], config: { + publish: isTag ? [ + { provider: 'bintray', component: 'main' }, + { provider: 'github' }, + ] : [ + { provider: 'bintray', component: 'nightly' }, + ], extraMetadata: { version: vars.version, }, }, - publish: isTag ? 'always' : 'onTag', + publish: isCI ? 'always' : 'onTag', }).catch(() => process.exit(1)) diff --git a/scripts/build-macos.js b/scripts/build-macos.js index 6d96e032..a8b0562d 100755 --- a/scripts/build-macos.js +++ b/scripts/build-macos.js @@ -3,14 +3,21 @@ const builder = require('electron-builder').build const vars = require('./vars') const isTag = (process.env.GITHUB_REF || '').startsWith('refs/tags/') +const isCI = !!process.env.GITHUB_REF builder({ dir: true, mac: ['pkg', 'zip'], config: { + publish: isTag ? [ + { provider: 'bintray', component: 'main' }, + { provider: 'github' }, + ] : [ + { provider: 'bintray', component: 'nightly' }, + ], extraMetadata: { version: vars.version, }, }, - publish: isTag ? 'always' : 'onTag', + publish: isCI ? 'always' : 'onTag', }).catch(() => process.exit(1)) diff --git a/scripts/build-windows.js b/scripts/build-windows.js index eb6ab2fb..d14697a6 100755 --- a/scripts/build-windows.js +++ b/scripts/build-windows.js @@ -3,14 +3,21 @@ const builder = require('electron-builder').build const vars = require('./vars') const isTag = (process.env.GITHUB_REF || '').startsWith('refs/tags/') +const isCI = !!process.env.GITHUB_REF builder({ dir: true, win: ['nsis', 'portable'], config: { + publish: isTag ? [ + { provider: 'bintray', component: 'main' }, + { provider: 'github' }, + ] : [ + { provider: 'bintray', component: 'nightly' }, + ], extraMetadata: { version: vars.version, }, }, - publish: isTag ? 'always' : 'onTag', + publish: isCI ? 'always' : 'onTag', }).catch(() => process.exit(1)) From a8e1cee84a13ee81e129d6b149fcc84ca196a5ee Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Tue, 27 Aug 2019 00:15:49 +0200 Subject: [PATCH 14/16] bintray --- scripts/build-linux.js | 4 ++-- scripts/build-macos.js | 4 ++-- scripts/build-windows.js | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/build-linux.js b/scripts/build-linux.js index 654a9f3d..228dbf95 100755 --- a/scripts/build-linux.js +++ b/scripts/build-linux.js @@ -10,10 +10,10 @@ builder({ linux: ['snap', 'deb', 'rpm', 'tar.gz'], config: { publish: isTag ? [ - { provider: 'bintray', component: 'main' }, + { provider: 'bintray', 'package': 'terminus' }, { provider: 'github' }, ] : [ - { provider: 'bintray', component: 'nightly' }, + { provider: 'bintray', 'package': 'terminus-nightly' }, ], extraMetadata: { version: vars.version, diff --git a/scripts/build-macos.js b/scripts/build-macos.js index a8b0562d..d58b743b 100755 --- a/scripts/build-macos.js +++ b/scripts/build-macos.js @@ -10,10 +10,10 @@ builder({ mac: ['pkg', 'zip'], config: { publish: isTag ? [ - { provider: 'bintray', component: 'main' }, + { provider: 'bintray', 'package': 'terminus' }, { provider: 'github' }, ] : [ - { provider: 'bintray', component: 'nightly' }, + { provider: 'bintray', 'package': 'terminus-nightly' }, ], extraMetadata: { version: vars.version, diff --git a/scripts/build-windows.js b/scripts/build-windows.js index d14697a6..e62a7739 100755 --- a/scripts/build-windows.js +++ b/scripts/build-windows.js @@ -10,10 +10,10 @@ builder({ win: ['nsis', 'portable'], config: { publish: isTag ? [ - { provider: 'bintray', component: 'main' }, + { provider: 'bintray', 'package': 'terminus' }, { provider: 'github' }, ] : [ - { provider: 'bintray', component: 'nightly' }, + { provider: 'bintray', 'package': 'terminus-nightly' }, ], extraMetadata: { version: vars.version, From 68220d1afc0f9f3d7bcb8775144c30120be80e59 Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Tue, 27 Aug 2019 10:20:12 +0200 Subject: [PATCH 15/16] Revert "Delete appveyor.yml" This reverts commit 3bc387b1d991fc2c0cf70b6c663b25e20e6447f1. --- appveyor.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 appveyor.yml diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 00000000..c67fc192 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,28 @@ +os: Visual Studio 2017 + +platform: + - x64 + +environment: + nodejs_version: "10" + +version: "{build}" + +install: + - ps: Install-Product node $env:nodejs_version $env:platform + - yarn + - node scripts/build-native.js + +build_script: + - yarn run build + - node scripts/prepackage-plugins.js + - node scripts/build-windows.js + +artifacts: + - path: 'dist\*.exe' + +cache: + - node_modules + - "*\\node_modules" + - "%USERPROFILE%\\.electron" + - "%LOCALAPPDATA%\\Yarn" From b79b3302abaa57f02dc7e925efab793859fcc775 Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Tue, 27 Aug 2019 10:33:30 +0200 Subject: [PATCH 16/16] ci --- README.md | 3 +-- scripts/build-linux.js | 8 +------- scripts/build-macos.js | 8 +------- scripts/build-windows.js | 10 ++-------- 4 files changed, 5 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 0fc38993..37c3ba8f 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,7 @@

- GitHub Travis (.org) - AppVeyor Azure Pipelines + GitHub AppVeyor

diff --git a/scripts/build-linux.js b/scripts/build-linux.js index 228dbf95..741794dd 100755 --- a/scripts/build-linux.js +++ b/scripts/build-linux.js @@ -9,15 +9,9 @@ builder({ dir: true, linux: ['snap', 'deb', 'rpm', 'tar.gz'], config: { - publish: isTag ? [ - { provider: 'bintray', 'package': 'terminus' }, - { provider: 'github' }, - ] : [ - { provider: 'bintray', 'package': 'terminus-nightly' }, - ], extraMetadata: { version: vars.version, }, }, - publish: isCI ? 'always' : 'onTag', + publish: isTag ? 'always' : 'onTag', }).catch(() => process.exit(1)) diff --git a/scripts/build-macos.js b/scripts/build-macos.js index d58b743b..ecc08471 100755 --- a/scripts/build-macos.js +++ b/scripts/build-macos.js @@ -9,15 +9,9 @@ builder({ dir: true, mac: ['pkg', 'zip'], config: { - publish: isTag ? [ - { provider: 'bintray', 'package': 'terminus' }, - { provider: 'github' }, - ] : [ - { provider: 'bintray', 'package': 'terminus-nightly' }, - ], extraMetadata: { version: vars.version, }, }, - publish: isCI ? 'always' : 'onTag', + publish: isTag ? 'always' : 'onTag', }).catch(() => process.exit(1)) diff --git a/scripts/build-windows.js b/scripts/build-windows.js index e62a7739..50065cd7 100755 --- a/scripts/build-windows.js +++ b/scripts/build-windows.js @@ -2,22 +2,16 @@ const builder = require('electron-builder').build const vars = require('./vars') -const isTag = (process.env.GITHUB_REF || '').startsWith('refs/tags/') +const isTag = (process.env.GITHUB_REF || process.env.BUILD_SOURCEBRANCH || '').startsWith('refs/tags/') const isCI = !!process.env.GITHUB_REF builder({ dir: true, win: ['nsis', 'portable'], config: { - publish: isTag ? [ - { provider: 'bintray', 'package': 'terminus' }, - { provider: 'github' }, - ] : [ - { provider: 'bintray', 'package': 'terminus-nightly' }, - ], extraMetadata: { version: vars.version, }, }, - publish: isCI ? 'always' : 'onTag', + publish: isTag ? 'always' : 'onTag', }).catch(() => process.exit(1))