From 6ebbe16070206ca02c8f958738ed25b4d4607f2c Mon Sep 17 00:00:00 2001 From: Joseph Flinn <58369717+joseph-flinn@users.noreply.github.com> Date: Fri, 11 Dec 2020 15:42:43 -0800 Subject: [PATCH 01/15] Set up CI with Azure Pipelines testing ci with azure pipelines [skip ci] --- azure-pipelines.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 azure-pipelines.yml diff --git a/azure-pipelines.yml b/azure-pipelines.yml new file mode 100644 index 0000000000..77558369d3 --- /dev/null +++ b/azure-pipelines.yml @@ -0,0 +1,24 @@ +# Node.js +# Build a general Node.js project with npm. +# Add steps that analyze code, save build artifacts, deploy, and more: +# https://docs.microsoft.com/azure/devops/pipelines/languages/javascript + +trigger: +- main + +pool: + vmImage: 'windows-latest' + +steps: +- task: NodeTool@0 + inputs: + versionSpec: '10.x' + displayName: 'Install Node.js' + +- script: npm install + displayName: 'npm install' + +- script: | + npm run build + npm npm run clean:dist + electron-builder --win --x64 --ia32 -p never From 4fea0cdb0f03c94d87972fe17144f67739ca5fbc Mon Sep 17 00:00:00 2001 From: Joseph Flinn <58369717+joseph-flinn@users.noreply.github.com> Date: Fri, 11 Dec 2020 15:46:37 -0800 Subject: [PATCH 02/15] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 77558369d3..55d710ef8e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -21,4 +21,7 @@ steps: - script: | npm run build npm npm run clean:dist - electron-builder --win --x64 --ia32 -p never + displayName: 'npm build' + +- script: electron-builder --win --x64 --ia32 -p never + displayName: 'electron-builder package' From 792c6a3139112298de7e65b02b8be25a105915d0 Mon Sep 17 00:00:00 2001 From: Joseph Flinn <58369717+joseph-flinn@users.noreply.github.com> Date: Fri, 11 Dec 2020 16:12:08 -0800 Subject: [PATCH 03/15] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 55d710ef8e..dc3097f6ab 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -23,5 +23,5 @@ steps: npm npm run clean:dist displayName: 'npm build' -- script: electron-builder --win --x64 --ia32 -p never +- script: npm-run node_modules/.bin/electron-builder --win --x64 --ia32 -p never displayName: 'electron-builder package' From 5924e108cfdc439910616735c97ca5530ad401ae Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Mon, 14 Dec 2020 15:38:45 +0000 Subject: [PATCH 04/15] trying different syntax to see if that fixes the npm run problem --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index dc3097f6ab..6538861f04 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -23,5 +23,5 @@ steps: npm npm run clean:dist displayName: 'npm build' -- script: npm-run node_modules/.bin/electron-builder --win --x64 --ia32 -p never +- script: npm run node_modules/.bin/electron-builder --win --x64 --ia32 -p never displayName: 'electron-builder package' From 7deda0a1172888675253eb16a57b5df1487ba421 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Mon, 14 Dec 2020 15:57:45 +0000 Subject: [PATCH 05/15] debugging npm scripts in azure pipeline --- azure-pipelines.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6538861f04..ebb4631870 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -18,6 +18,9 @@ steps: - script: npm install displayName: 'npm install' +- script: ls -alht node_modules/.bin/ + displayName: show node scripts + - script: | npm run build npm npm run clean:dist From 9bad72db67979a74b820f2aa41662ff3e725af91 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Mon, 14 Dec 2020 17:41:26 +0000 Subject: [PATCH 06/15] changing electron-builder to npx --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ebb4631870..f1842d6844 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -26,5 +26,5 @@ steps: npm npm run clean:dist displayName: 'npm build' -- script: npm run node_modules/.bin/electron-builder --win --x64 --ia32 -p never +- script: npx electron-builder --win --x64 --ia32 -p never displayName: 'electron-builder package' From ae80649466075983977356a504d171d0d07cfc99 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Mon, 14 Dec 2020 18:47:21 +0000 Subject: [PATCH 07/15] grabbing executable names --- azure-pipelines.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f1842d6844..f9bf2e5020 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -18,9 +18,6 @@ steps: - script: npm install displayName: 'npm install' -- script: ls -alht node_modules/.bin/ - displayName: show node scripts - - script: | npm run build npm npm run clean:dist @@ -28,3 +25,12 @@ steps: - script: npx electron-builder --win --x64 --ia32 -p never displayName: 'electron-builder package' + +- script: ls -alht dist + displayName: show executables + + #- task: PublishBuildArtifacts@1 + # inputs: + # pathToPublish: '$(Build.ArtifactStagingDirectory)/' + # artifactName: TestDesktop + From 926d221e6ab133460a9f36fff8fdc96d9d1fcc77 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Mon, 14 Dec 2020 19:04:39 +0000 Subject: [PATCH 08/15] testing artifact publishing --- azure-pipelines.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f9bf2e5020..35f0835d87 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -29,8 +29,12 @@ steps: - script: ls -alht dist displayName: show executables - #- task: PublishBuildArtifacts@1 - # inputs: - # pathToPublish: '$(Build.ArtifactStagingDirectory)/' - # artifactName: TestDesktop +- task: PublishBuildArtifacts@1 + inputs: + pathToPublish: '$(Build.ArtifactStagingDirectory)/dist/Bitwarden-1.23.1-ia32.appx' + artifactName: Bitwarden-1.23.1-ia32.appx +- task: PublishBuildArtifacts@1 + inputs: + pathToPublish: '$(Build.ArtifactStagingDirectory)/dist/Bitwarden-1.23.1-x64.appx' + artifactName: Bitwarden-1.23.1-x64.appx From 99e2b83d62bd1e6149395945ab9d02da616e6ad9 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Mon, 14 Dec 2020 19:25:24 +0000 Subject: [PATCH 09/15] adding git commit option --- azure-pipelines.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 35f0835d87..1f8ebb0cb0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -9,11 +9,16 @@ trigger: pool: vmImage: 'windows-latest' +variables: +- group: qa-envs + steps: - task: NodeTool@0 inputs: versionSpec: '10.x' displayName: 'Install Node.js' + +- checkout: $(GIT_COMMIT_TO_BUILD) - script: npm install displayName: 'npm install' @@ -31,10 +36,10 @@ steps: - task: PublishBuildArtifacts@1 inputs: - pathToPublish: '$(Build.ArtifactStagingDirectory)/dist/Bitwarden-1.23.1-ia32.appx' - artifactName: Bitwarden-1.23.1-ia32.appx + pathToPublish: 'dist/Bitwarden-1.23.1-ia32.appx' + artifactName: Bitwarden-$(GIT_COMMIT_TO_BUILD)-ia32.appx - task: PublishBuildArtifacts@1 inputs: - pathToPublish: '$(Build.ArtifactStagingDirectory)/dist/Bitwarden-1.23.1-x64.appx' - artifactName: Bitwarden-1.23.1-x64.appx + pathToPublish: 'dist/Bitwarden-1.23.1-x64.appx' + artifactName: Bitwarden-$(GIT_COMMIT_TO_BUILD)-x64.appx From 493ba4e488089485e6dd5b858fa154b4844babce Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Mon, 14 Dec 2020 19:27:23 +0000 Subject: [PATCH 10/15] checking out specific commit (for historical builds) --- azure-pipelines.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1f8ebb0cb0..5275076781 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -18,7 +18,8 @@ steps: versionSpec: '10.x' displayName: 'Install Node.js' -- checkout: $(GIT_COMMIT_TO_BUILD) +- script: git checkout $(GIT_COMMIT_TO_BUILD) + displayName: setup commit to build - script: npm install displayName: 'npm install' From 7fbce68530cbeac20704d635c911b14a2fd592f2 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Mon, 14 Dec 2020 19:53:39 +0000 Subject: [PATCH 11/15] changing over to manual run of the pipeline and moving from PublishBuildArtifact to PublishPipelineArtifact --- azure-pipelines.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5275076781..a69d2c9841 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,7 +4,7 @@ # https://docs.microsoft.com/azure/devops/pipelines/languages/javascript trigger: -- main +- none pool: vmImage: 'windows-latest' @@ -35,12 +35,12 @@ steps: - script: ls -alht dist displayName: show executables -- task: PublishBuildArtifacts@1 +- task: PublishPipelineArtifacts@1 inputs: pathToPublish: 'dist/Bitwarden-1.23.1-ia32.appx' artifactName: Bitwarden-$(GIT_COMMIT_TO_BUILD)-ia32.appx -- task: PublishBuildArtifacts@1 +- task: PublishPipelineArtifacts@1 inputs: pathToPublish: 'dist/Bitwarden-1.23.1-x64.appx' artifactName: Bitwarden-$(GIT_COMMIT_TO_BUILD)-x64.appx From ba2e3f5a111acaee80e5c4b7ce17e63fb417c41b Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Mon, 14 Dec 2020 19:56:29 +0000 Subject: [PATCH 12/15] fixing AZ pipeline task typo --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a69d2c9841..45d9e1cc55 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -35,12 +35,12 @@ steps: - script: ls -alht dist displayName: show executables -- task: PublishPipelineArtifacts@1 +- task: PublishPipelineArtifact@1 inputs: pathToPublish: 'dist/Bitwarden-1.23.1-ia32.appx' artifactName: Bitwarden-$(GIT_COMMIT_TO_BUILD)-ia32.appx -- task: PublishPipelineArtifacts@1 +- task: PublishPipelineArtifact@1 inputs: pathToPublish: 'dist/Bitwarden-1.23.1-x64.appx' artifactName: Bitwarden-$(GIT_COMMIT_TO_BUILD)-x64.appx From 1251ddaf5fca7ea83b67b0762bdc98194b50c721 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Mon, 14 Dec 2020 20:15:37 +0000 Subject: [PATCH 13/15] changing pathToPublish to absolute path --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 45d9e1cc55..2ae935be51 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -37,10 +37,10 @@ steps: - task: PublishPipelineArtifact@1 inputs: - pathToPublish: 'dist/Bitwarden-1.23.1-ia32.appx' + pathToPublish: '$(System.DefaultWorkingDirectory)/dist/Bitwarden-1.23.1-ia32.appx' artifactName: Bitwarden-$(GIT_COMMIT_TO_BUILD)-ia32.appx - task: PublishPipelineArtifact@1 inputs: - pathToPublish: 'dist/Bitwarden-1.23.1-x64.appx' + pathToPublish: '$(System.DefaultWorkingDirectory)/dist/Bitwarden-1.23.1-x64.appx' artifactName: Bitwarden-$(GIT_COMMIT_TO_BUILD)-x64.appx From 65e72b41a321902f412035e79a0ccadb26c4538d Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Mon, 14 Dec 2020 21:24:18 +0000 Subject: [PATCH 14/15] bumping version and updating azure pipeline --- azure-pipelines.yml | 27 ++++++++++----------------- src/package.json | 2 +- 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2ae935be51..bb7e13f169 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -3,24 +3,17 @@ # Add steps that analyze code, save build artifacts, deploy, and more: # https://docs.microsoft.com/azure/devops/pipelines/languages/javascript -trigger: -- none +trigger: none pool: vmImage: 'windows-latest' -variables: -- group: qa-envs - steps: - task: NodeTool@0 inputs: versionSpec: '10.x' displayName: 'Install Node.js' -- script: git checkout $(GIT_COMMIT_TO_BUILD) - displayName: setup commit to build - - script: npm install displayName: 'npm install' @@ -35,12 +28,12 @@ steps: - script: ls -alht dist displayName: show executables -- task: PublishPipelineArtifact@1 - inputs: - pathToPublish: '$(System.DefaultWorkingDirectory)/dist/Bitwarden-1.23.1-ia32.appx' - artifactName: Bitwarden-$(GIT_COMMIT_TO_BUILD)-ia32.appx - -- task: PublishPipelineArtifact@1 - inputs: - pathToPublish: '$(System.DefaultWorkingDirectory)/dist/Bitwarden-1.23.1-x64.appx' - artifactName: Bitwarden-$(GIT_COMMIT_TO_BUILD)-x64.appx +# - task: PublishPipelineArtifact@1 +# inputs: +# pathToPublish: '$(System.DefaultWorkingDirectory)/dist/Bitwarden-1.23.1-ia32.appx' +# artifactName: Bitwarden-$(GIT_COMMIT_TO_BUILD)-ia32.appx +# +# - task: PublishPipelineArtifact@1 +# inputs: +# pathToPublish: '$(System.DefaultWorkingDirectory)/dist/Bitwarden-1.23.1-x64.appx' +# artifactName: Bitwarden-$(GIT_COMMIT_TO_BUILD)-x64.appx diff --git a/src/package.json b/src/package.json index 781a491dc0..a80d985ab8 100644 --- a/src/package.json +++ b/src/package.json @@ -2,7 +2,7 @@ "name": "bitwarden", "productName": "Bitwarden", "description": "A secure and free password manager for all of your devices.", - "version": "1.23.1", + "version": "1.23.1a", "author": "Bitwarden Inc. (https://bitwarden.com)", "homepage": "https://bitwarden.com", "license": "GPL-3.0", From f78df842b6ba8d7139c45be289c3f23c7a865f94 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Mon, 14 Dec 2020 21:27:37 +0000 Subject: [PATCH 15/15] moved the AZ pipelines into their own directory for cleanliness --- azure-pipelines.yml => .az-pipelines/windows-build-sign.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename azure-pipelines.yml => .az-pipelines/windows-build-sign.yml (100%) diff --git a/azure-pipelines.yml b/.az-pipelines/windows-build-sign.yml similarity index 100% rename from azure-pipelines.yml rename to .az-pipelines/windows-build-sign.yml