From b84db15ac2f7fdc7c2c067429d1092e29e2bb235 Mon Sep 17 00:00:00 2001 From: Alexis Tyler Date: Tue, 20 Oct 2020 15:25:17 +1030 Subject: [PATCH 1/7] ci: add node versions to matrix --- azure-pipelines.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5cc349e..3a2f79f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -3,6 +3,12 @@ jobs: timeoutInMinutes: 120 strategy: matrix: + node_12_x: + nodeVersion: 12.x + node_13_x: + nodeVersion: 13.x + node_14_x: + nodeVersion: 14.x linux: imageName: 'ubuntu-16.04' mac: @@ -24,7 +30,7 @@ jobs: - task: NodeTool@0 displayName: Install Node inputs: - versionSpec: '10.x' + versionSpec: $(nodeVersion) # - script: sudo apt-get update && sudo apt-get install -y gcc-4.9 g++-4.9 # condition: contains(variables['Agent.JobName'], 'linux') # displayName: Install Linux build dependencies @@ -36,9 +42,7 @@ jobs: condition: contains(variables['Agent.JobName'], 'windows') - script: npm ci displayName: Install dependencies - - script: node js2bin.js --ci --node=12.18.4 --size=2MB --size=4MB --upload --clean + - script: node js2bin.js --ci --node=$(nodeVersion) --size=2MB --size=4MB --upload --clean displayName: Build base node binaries env: GITHUB_TOKEN: $(PersonalGithubToken) - - From 1246a6a000055381487ddfcd08b8488cde07957c Mon Sep 17 00:00:00 2001 From: Alexis Tyler Date: Tue, 20 Oct 2020 15:31:21 +1030 Subject: [PATCH 2/7] ci: fix matrix --- azure-pipelines.yml | 80 +++++++++++++++++++-------------------------- 1 file changed, 33 insertions(+), 47 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3a2f79f..a347705 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,48 +1,34 @@ jobs: -- job: BuildBaseExe - timeoutInMinutes: 120 - strategy: - matrix: - node_12_x: - nodeVersion: 12.x - node_13_x: - nodeVersion: 13.x - node_14_x: - nodeVersion: 14.x - linux: - imageName: 'ubuntu-16.04' - mac: - imageName: 'macos-10.14' - windows_2017: - imageName: 'vs2017-win2016' - # windows_2015: - # imageName: 'vs2017-win2016' -# alpine: -# imageName: 'ubuntu-16.04' - pool: - vmImage: $(imageName) - steps: - - task: UsePythonVersion@0 - displayName: Setup Python - inputs: - versionSpec: '2.7' - architecture: 'x64' - - task: NodeTool@0 - displayName: Install Node - inputs: - versionSpec: $(nodeVersion) - # - script: sudo apt-get update && sudo apt-get install -y gcc-4.9 g++-4.9 - # condition: contains(variables['Agent.JobName'], 'linux') - # displayName: Install Linux build dependencies - - script: choco install visualcpp-build-tools --version 14.0.25420.1 -fy && npm config set msvs_version 2015 - condition: contains(variables['Agent.JobName'], 'windows_2015') - displayName: Install Windows build dependencies - - script: choco install nasm -fy - displayName: Install Windows Assembler (NASM) - condition: contains(variables['Agent.JobName'], 'windows') - - script: npm ci - displayName: Install dependencies - - script: node js2bin.js --ci --node=$(nodeVersion) --size=2MB --size=4MB --upload --clean - displayName: Build base node binaries - env: - GITHUB_TOKEN: $(PersonalGithubToken) + - ${{ each platform in parameters.platform }}: + - ${{ each nodeVersion in parameters.nodeVersion }}: + - job: + displayName: ${{ platform }} node v${{ nodeVersion }} + timeoutInMinutes: 120 + + pool: + vmImage: $(imageName) + steps: + - task: UsePythonVersion@0 + displayName: Setup Python + inputs: + versionSpec: '2.7' + architecture: 'x64' + - task: NodeTool@0 + displayName: Install Node + inputs: + versionSpec: $(nodeVersion) + # - script: sudo apt-get update && sudo apt-get install -y gcc-4.9 g++-4.9 + # condition: contains(variables['Agent.JobName'], 'linux') + # displayName: Install Linux build dependencies + - script: choco install visualcpp-build-tools --version 14.0.25420.1 -fy && npm config set msvs_version 2015 + condition: contains(variables['Agent.JobName'], 'windows_2015') + displayName: Install Windows build dependencies + - script: choco install nasm -fy + displayName: Install Windows Assembler (NASM) + condition: contains(variables['Agent.JobName'], 'windows') + - script: npm ci + displayName: Install dependencies + - script: node js2bin.js --ci --node=$(nodeVersion) --size=2MB --size=4MB --upload --clean + displayName: Build base node binaries + env: + GITHUB_TOKEN: $(PersonalGithubToken) From 1f3a581f82c53202b71056ad8720b21f7e6b3595 Mon Sep 17 00:00:00 2001 From: Alexis Tyler Date: Tue, 20 Oct 2020 15:33:22 +1030 Subject: [PATCH 3/7] ci: add matrix as parameters --- azure-pipelines.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a347705..83f8992 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,3 +1,7 @@ +parameters: + platform: ['ubuntu-16.04','macos-10.14', 'vs2017-win2016'] + nodeVersion: ['12.x','13.x', '14.x'] + jobs: - ${{ each platform in parameters.platform }}: - ${{ each nodeVersion in parameters.nodeVersion }}: From 063499b995a4b4802e3f48590a8e378d9c53351f Mon Sep 17 00:00:00 2001 From: Alexis Tyler Date: Tue, 20 Oct 2020 15:35:15 +1030 Subject: [PATCH 4/7] ci: fix yaml --- azure-pipelines.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 83f8992..891f2cc 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,6 +1,12 @@ -parameters: - platform: ['ubuntu-16.04','macos-10.14', 'vs2017-win2016'] - nodeVersion: ['12.x','13.x', '14.x'] +parameters: + nodeVersion: + - 12.x + - 13.x + - 14.x + platform: + - ubuntu-16.04 + - macos-10.14 + - vs2017-win2016 jobs: - ${{ each platform in parameters.platform }}: From 07d39cc1072b49718292ffa5684683331620200b Mon Sep 17 00:00:00 2001 From: Alexis Tyler Date: Tue, 20 Oct 2020 16:09:07 +1030 Subject: [PATCH 5/7] ci: switch to template file --- azure-pipelines-template.yml | 34 +++++++++++++++++++++++++++ azure-pipelines.yml | 45 +++++------------------------------- 2 files changed, 40 insertions(+), 39 deletions(-) create mode 100644 azure-pipelines-template.yml diff --git a/azure-pipelines-template.yml b/azure-pipelines-template.yml new file mode 100644 index 0000000..ee99bf1 --- /dev/null +++ b/azure-pipelines-template.yml @@ -0,0 +1,34 @@ +jobs: + - ${{ each platform in parameters.platforms }}: + - ${{ each nodeVersion in parameters.nodeVersions }}: + - job: + displayName: ${{ format('{0} node v{1}', platform, nodeVersion) }} + timeoutInMinutes: 120 + + pool: + vmImage: $(imageName) + steps: + - task: UsePythonVersion@0 + displayName: Setup Python + inputs: + versionSpec: '2.7' + architecture: 'x64' + - task: NodeTool@0 + displayName: Install Node + inputs: + versionSpec: $(nodeVersion) + # - script: sudo apt-get update && sudo apt-get install -y gcc-4.9 g++-4.9 + # condition: contains(variables['Agent.JobName'], 'linux') + # displayName: Install Linux build dependencies + - script: choco install visualcpp-build-tools --version 14.0.25420.1 -fy && npm config set msvs_version 2015 + condition: contains(variables['Agent.JobName'], 'windows_2015') + displayName: Install Windows build dependencies + - script: choco install nasm -fy + displayName: Install Windows Assembler (NASM) + condition: contains(variables['Agent.JobName'], 'windows') + - script: npm ci + displayName: Install dependencies + - script: node js2bin.js --ci --node=$(nodeVersion) --size=2MB --size=4MB --upload --clean + displayName: Build base node binaries + env: + GITHUB_TOKEN: $(PersonalGithubToken) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 891f2cc..85a5a34 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,44 +1,11 @@ -parameters: - nodeVersion: +jobs: + - template: azure-pipelines-template.yml + parameters: + nodeVersions: - 12.x - 13.x - 14.x - platform: + platforms: - ubuntu-16.04 - macos-10.14 - - vs2017-win2016 - -jobs: - - ${{ each platform in parameters.platform }}: - - ${{ each nodeVersion in parameters.nodeVersion }}: - - job: - displayName: ${{ platform }} node v${{ nodeVersion }} - timeoutInMinutes: 120 - - pool: - vmImage: $(imageName) - steps: - - task: UsePythonVersion@0 - displayName: Setup Python - inputs: - versionSpec: '2.7' - architecture: 'x64' - - task: NodeTool@0 - displayName: Install Node - inputs: - versionSpec: $(nodeVersion) - # - script: sudo apt-get update && sudo apt-get install -y gcc-4.9 g++-4.9 - # condition: contains(variables['Agent.JobName'], 'linux') - # displayName: Install Linux build dependencies - - script: choco install visualcpp-build-tools --version 14.0.25420.1 -fy && npm config set msvs_version 2015 - condition: contains(variables['Agent.JobName'], 'windows_2015') - displayName: Install Windows build dependencies - - script: choco install nasm -fy - displayName: Install Windows Assembler (NASM) - condition: contains(variables['Agent.JobName'], 'windows') - - script: npm ci - displayName: Install dependencies - - script: node js2bin.js --ci --node=$(nodeVersion) --size=2MB --size=4MB --upload --clean - displayName: Build base node binaries - env: - GITHUB_TOKEN: $(PersonalGithubToken) + - vs2017-win2016 \ No newline at end of file From b0fa193cd3d5aedf3436f652f69eb1b9019188ca Mon Sep 17 00:00:00 2001 From: Alexis Tyler Date: Tue, 20 Oct 2020 16:10:37 +1030 Subject: [PATCH 6/7] ci: fix yaml formatting --- azure-pipelines-template.yml | 64 ++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/azure-pipelines-template.yml b/azure-pipelines-template.yml index ee99bf1..7069de9 100644 --- a/azure-pipelines-template.yml +++ b/azure-pipelines-template.yml @@ -1,34 +1,34 @@ jobs: - - ${{ each platform in parameters.platforms }}: - - ${{ each nodeVersion in parameters.nodeVersions }}: - - job: - displayName: ${{ format('{0} node v{1}', platform, nodeVersion) }} - timeoutInMinutes: 120 + - ${{ each platform in parameters.platforms }}: + - ${{ each nodeVersion in parameters.nodeVersions }}: + - job: + displayName: ${{ format('{0} node v{1}', platform, nodeVersion) }} + timeoutInMinutes: 120 - pool: - vmImage: $(imageName) - steps: - - task: UsePythonVersion@0 - displayName: Setup Python - inputs: - versionSpec: '2.7' - architecture: 'x64' - - task: NodeTool@0 - displayName: Install Node - inputs: - versionSpec: $(nodeVersion) - # - script: sudo apt-get update && sudo apt-get install -y gcc-4.9 g++-4.9 - # condition: contains(variables['Agent.JobName'], 'linux') - # displayName: Install Linux build dependencies - - script: choco install visualcpp-build-tools --version 14.0.25420.1 -fy && npm config set msvs_version 2015 - condition: contains(variables['Agent.JobName'], 'windows_2015') - displayName: Install Windows build dependencies - - script: choco install nasm -fy - displayName: Install Windows Assembler (NASM) - condition: contains(variables['Agent.JobName'], 'windows') - - script: npm ci - displayName: Install dependencies - - script: node js2bin.js --ci --node=$(nodeVersion) --size=2MB --size=4MB --upload --clean - displayName: Build base node binaries - env: - GITHUB_TOKEN: $(PersonalGithubToken) + pool: + vmImage: $(imageName) + steps: + - task: UsePythonVersion@0 + displayName: Setup Python + inputs: + versionSpec: '2.7' + architecture: 'x64' + - task: NodeTool@0 + displayName: Install Node + inputs: + versionSpec: $(nodeVersion) + # - script: sudo apt-get update && sudo apt-get install -y gcc-4.9 g++-4.9 + # condition: contains(variables['Agent.JobName'], 'linux') + # displayName: Install Linux build dependencies + - script: choco install visualcpp-build-tools --version 14.0.25420.1 -fy && npm config set msvs_version 2015 + condition: contains(variables['Agent.JobName'], 'windows_2015') + displayName: Install Windows build dependencies + - script: choco install nasm -fy + displayName: Install Windows Assembler (NASM) + condition: contains(variables['Agent.JobName'], 'windows') + - script: npm ci + displayName: Install dependencies + - script: node js2bin.js --ci --node=$(nodeVersion) --size=2MB --size=4MB --upload --clean + displayName: Build base node binaries + env: + GITHUB_TOKEN: $(PersonalGithubToken) From cecdc6deae9ae8e514c42b9c18d2d77eb64222f7 Mon Sep 17 00:00:00 2001 From: Alexis Tyler Date: Tue, 20 Oct 2020 16:12:12 +1030 Subject: [PATCH 7/7] ci: fix yaml formatting --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 85a5a34..e5047e9 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,5 +1,5 @@ jobs: - - template: azure-pipelines-template.yml +- template: azure-pipelines-template.yml parameters: nodeVersions: - 12.x