From fcda558692bb93aded49c4db54aa6b52b06cf09f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= Date: Thu, 30 May 2019 23:07:26 +0200 Subject: [PATCH 01/16] make CI config DRY --- .ci/steps.unix.yml | 7 +++++++ .ci/steps.win.yml | 7 +++++++ azure-pipelines.yml | 29 +++++++++-------------------- 3 files changed, 23 insertions(+), 20 deletions(-) create mode 100644 .ci/steps.unix.yml create mode 100644 .ci/steps.win.yml diff --git a/.ci/steps.unix.yml b/.ci/steps.unix.yml new file mode 100644 index 000000000000..fd057777309a --- /dev/null +++ b/.ci/steps.unix.yml @@ -0,0 +1,7 @@ +steps: + - script: npm install eslint typescript@$(TS_VERSION) @typescript-eslint/eslint-plugin @typescript-eslint/parser eslint-config-prettier + - script: curl -L https://deno.land/x/install/install.sh | sh -s $(DENO_VERSION) + - script: echo '##vso[task.prependpath]$(HOME)/.deno/bin/' + - script: npx eslint **/*.ts --max-warnings=0 + - script: ${{ parameters.exe_name }} run --allow-run --allow-write --allow-read format.ts --check + - script: ${{ parameters.exe_name }} run --allow-run --allow-net --allow-write --allow-read --config=tsconfig.test.json test.ts diff --git a/.ci/steps.win.yml b/.ci/steps.win.yml new file mode 100644 index 000000000000..c963ae7867a3 --- /dev/null +++ b/.ci/steps.win.yml @@ -0,0 +1,7 @@ +steps: + - bash: npm install eslint typescript@$(TS_VERSION) @typescript-eslint/eslint-plugin @typescript-eslint/parser eslint-config-prettier + - powershell: iwr https://deno.land/x/install/install.ps1 -out install.ps1; .\install.ps1 $(DENO_VERSION) + - bash: echo "##vso[task.prependpath]C:\Users\VssAdministrator\.deno\\bin" + - bash: npx eslint **/*.ts --max-warnings=0 + - bash: ${{ parameters.exe_name }} run --allow-run --allow-write --allow-read format.ts --check + - bash: ${{ parameters.exe_name }} run --allow-run --allow-net --allow-write --allow-read --config=tsconfig.test.json test.ts diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b993f7aafb0c..171ecb004518 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -2,39 +2,28 @@ variables: DENO_VERSION: "v0.7.0" TS_VERSION: "3.4.5" -# TODO DRY up the jobs # TODO Try to get eslint to run under Deno, like prettier jobs: - job: "Linux" pool: vmImage: "Ubuntu-16.04" steps: - - script: npm install eslint typescript@$(TS_VERSION) @typescript-eslint/eslint-plugin @typescript-eslint/parser eslint-config-prettier - - script: curl -L https://deno.land/x/install/install.sh | sh -s $(DENO_VERSION) - - script: echo '##vso[task.prependpath]$(HOME)/.deno/bin/' - - script: npx eslint **/*.ts --max-warnings=0 - - script: deno run --allow-run --allow-write --allow-read format.ts --check - - script: deno run --allow-run --allow-net --allow-write --allow-read --config=tsconfig.test.json test.ts + - template: .ci/steps.unix.yml + parameters: + - exe_name: "deno" - job: "Mac" pool: vmImage: "macOS-10.13" steps: - - script: npm install -g functional-red-black-tree - - script: npm install -g eslint typescript@$(TS_VERSION) @typescript-eslint/eslint-plugin @typescript-eslint/parser eslint-config-prettier - - script: curl -L https://deno.land/x/install/install.sh | sh -s $(DENO_VERSION) - - script: echo '##vso[task.prependpath]$(HOME)/.deno/bin/' - - script: eslint **/*.ts --max-warnings=0 - - script: deno run --allow-run --allow-write --allow-read format.ts --check - - script: deno run --allow-run --allow-net --allow-write --allow-read --config=tsconfig.test.json test.ts + - template: .ci/steps.unix.yml + parameters: + - exe_name: "deno" - job: "Windows" pool: vmImage: "vs2017-win2016" steps: - - bash: npm install eslint typescript@$(TS_VERSION) @typescript-eslint/eslint-plugin @typescript-eslint/parser eslint-config-prettier - - powershell: iwr https://deno.land/x/install/install.ps1 -out install.ps1; .\install.ps1 $(DENO_VERSION) - - bash: echo "##vso[task.prependpath]C:\Users\VssAdministrator\.deno\\bin" - - bash: npx eslint **/*.ts --max-warnings=0 - - bash: deno.exe run --allow-run --allow-write --allow-read format.ts --check - - bash: deno.exe run --allow-run --allow-net --allow-write --allow-read --config=tsconfig.test.json test.ts + - template: .ci/steps.win.yml + parameters: + - exe_name: "deno.exe" From 3f82844b818201e5d7662ece5599c3afe65061b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= Date: Fri, 31 May 2019 18:42:18 +0200 Subject: [PATCH 02/16] use bash for unix pipelines --- .ci/steps.unix.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.ci/steps.unix.yml b/.ci/steps.unix.yml index fd057777309a..576d25c65e34 100644 --- a/.ci/steps.unix.yml +++ b/.ci/steps.unix.yml @@ -1,7 +1,7 @@ steps: - - script: npm install eslint typescript@$(TS_VERSION) @typescript-eslint/eslint-plugin @typescript-eslint/parser eslint-config-prettier - - script: curl -L https://deno.land/x/install/install.sh | sh -s $(DENO_VERSION) - - script: echo '##vso[task.prependpath]$(HOME)/.deno/bin/' - - script: npx eslint **/*.ts --max-warnings=0 - - script: ${{ parameters.exe_name }} run --allow-run --allow-write --allow-read format.ts --check - - script: ${{ parameters.exe_name }} run --allow-run --allow-net --allow-write --allow-read --config=tsconfig.test.json test.ts + - bash: npm install eslint typescript@$(TS_VERSION) @typescript-eslint/eslint-plugin @typescript-eslint/parser eslint-config-prettier + - bash: curl -L https://deno.land/x/install/install.sh | sh -s $(DENO_VERSION) + - bash: echo '##vso[task.prependpath]$(HOME)/.deno/bin/' + - bash: npx eslint **/*.ts --max-warnings=0 + - bash: ${{ parameters.exe_name }} run --allow-run --allow-write --allow-read format.ts --check + - bash: ${{ parameters.exe_name }} run --allow-run --allow-net --allow-write --allow-read --config=tsconfig.test.json test.ts From a2246be2f3e12ce3a188c1b68dde68161e1ca35e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= Date: Fri, 31 May 2019 18:47:19 +0200 Subject: [PATCH 03/16] use conditional in template --- .ci/steps.unix.yml | 7 ------- .ci/steps.win.yml | 7 ------- azure-pipelines.yml | 7 ++++--- azure-template.yml | 11 +++++++++++ 4 files changed, 15 insertions(+), 17 deletions(-) delete mode 100644 .ci/steps.unix.yml delete mode 100644 .ci/steps.win.yml create mode 100644 azure-template.yml diff --git a/.ci/steps.unix.yml b/.ci/steps.unix.yml deleted file mode 100644 index 576d25c65e34..000000000000 --- a/.ci/steps.unix.yml +++ /dev/null @@ -1,7 +0,0 @@ -steps: - - bash: npm install eslint typescript@$(TS_VERSION) @typescript-eslint/eslint-plugin @typescript-eslint/parser eslint-config-prettier - - bash: curl -L https://deno.land/x/install/install.sh | sh -s $(DENO_VERSION) - - bash: echo '##vso[task.prependpath]$(HOME)/.deno/bin/' - - bash: npx eslint **/*.ts --max-warnings=0 - - bash: ${{ parameters.exe_name }} run --allow-run --allow-write --allow-read format.ts --check - - bash: ${{ parameters.exe_name }} run --allow-run --allow-net --allow-write --allow-read --config=tsconfig.test.json test.ts diff --git a/.ci/steps.win.yml b/.ci/steps.win.yml deleted file mode 100644 index c963ae7867a3..000000000000 --- a/.ci/steps.win.yml +++ /dev/null @@ -1,7 +0,0 @@ -steps: - - bash: npm install eslint typescript@$(TS_VERSION) @typescript-eslint/eslint-plugin @typescript-eslint/parser eslint-config-prettier - - powershell: iwr https://deno.land/x/install/install.ps1 -out install.ps1; .\install.ps1 $(DENO_VERSION) - - bash: echo "##vso[task.prependpath]C:\Users\VssAdministrator\.deno\\bin" - - bash: npx eslint **/*.ts --max-warnings=0 - - bash: ${{ parameters.exe_name }} run --allow-run --allow-write --allow-read format.ts --check - - bash: ${{ parameters.exe_name }} run --allow-run --allow-net --allow-write --allow-read --config=tsconfig.test.json test.ts diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 171ecb004518..a325a81805c0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -8,7 +8,7 @@ jobs: pool: vmImage: "Ubuntu-16.04" steps: - - template: .ci/steps.unix.yml + - template: azure-template.yml parameters: - exe_name: "deno" @@ -16,7 +16,7 @@ jobs: pool: vmImage: "macOS-10.13" steps: - - template: .ci/steps.unix.yml + - template: azure-template.yml parameters: - exe_name: "deno" @@ -24,6 +24,7 @@ jobs: pool: vmImage: "vs2017-win2016" steps: - - template: .ci/steps.win.yml + - template: azure-template.yml parameters: - exe_name: "deno.exe" + - windows: 'true' diff --git a/azure-template.yml b/azure-template.yml new file mode 100644 index 000000000000..ce58ff814e9d --- /dev/null +++ b/azure-template.yml @@ -0,0 +1,11 @@ +steps: + - bash: npm install eslint typescript@$(TS_VERSION) @typescript-eslint/eslint-plugin @typescript-eslint/parser eslint-config-prettier + - ${{ if eq(parameters.windows, 'true') }}: + - powershell: iwr https://deno.land/x/install/install.ps1 -out install.ps1; .\install.ps1 $(DENO_VERSION) + - bash: echo "##vso[task.prependpath]C:\Users\VssAdministrator\.deno\\bin" + - ${{ if eq(parameters.windows, 'false') }}: + - bash: curl -L https://deno.land/x/install/install.sh | sh -s $(DENO_VERSION) + - bash: echo '##vso[task.prependpath]$(HOME)/.deno/bin/' + - bash: npx eslint **/*.ts --max-warnings=0 + - bash: ${{ parameters.exe_name }} run --allow-run --allow-write --allow-read format.ts --check + - bash: ${{ parameters.exe_name }} run --allow-run --allow-net --allow-write --allow-read --config=tsconfig.test.json test.ts From 1cc60dd08b1dfd685b69ea97030ee2be22a5416b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= Date: Fri, 31 May 2019 18:49:08 +0200 Subject: [PATCH 04/16] parameters before steps --- azure-pipelines.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a325a81805c0..914a4f515b28 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -7,24 +7,24 @@ jobs: - job: "Linux" pool: vmImage: "Ubuntu-16.04" - steps: - - template: azure-template.yml parameters: - exe_name: "deno" + steps: + - template: azure-template.yml - job: "Mac" pool: vmImage: "macOS-10.13" - steps: - - template: azure-template.yml parameters: - exe_name: "deno" + steps: + - template: azure-template.yml - job: "Windows" pool: vmImage: "vs2017-win2016" - steps: - - template: azure-template.yml parameters: - exe_name: "deno.exe" - windows: 'true' + steps: + - template: azure-template.yml From 01a7dcfca301ef9846401a7baac3c31485ae2c06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= Date: Fri, 31 May 2019 18:53:13 +0200 Subject: [PATCH 05/16] parameters under template --- azure-pipelines.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 914a4f515b28..01940b9955c5 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -7,24 +7,26 @@ jobs: - job: "Linux" pool: vmImage: "Ubuntu-16.04" - parameters: - - exe_name: "deno" steps: - template: azure-template.yml + parameters: + exe_name: "deno" + windows: "false" - job: "Mac" pool: vmImage: "macOS-10.13" - parameters: - - exe_name: "deno" steps: - template: azure-template.yml + parameters: + exe_name: "deno" + windows: "false" - job: "Windows" pool: vmImage: "vs2017-win2016" - parameters: - - exe_name: "deno.exe" - - windows: 'true' steps: - template: azure-template.yml + parameters: + exe_name: "deno.exe" + windows: "true" From 1177896257255f2fa172f9a256eb6722c0311727 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= Date: Fri, 31 May 2019 19:07:31 +0200 Subject: [PATCH 06/16] dedup further --- azure-pipelines.yml | 8 +------- azure-template.yml | 4 ++++ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 01940b9955c5..ca51e469b1bc 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -9,18 +9,12 @@ jobs: vmImage: "Ubuntu-16.04" steps: - template: azure-template.yml - parameters: - exe_name: "deno" - windows: "false" - job: "Mac" pool: vmImage: "macOS-10.13" steps: - template: azure-template.yml - parameters: - exe_name: "deno" - windows: "false" - job: "Windows" pool: @@ -28,5 +22,5 @@ jobs: steps: - template: azure-template.yml parameters: - exe_name: "deno.exe" + exe_suffix: ".exe" windows: "true" diff --git a/azure-template.yml b/azure-template.yml index ce58ff814e9d..446f9ff3b37c 100644 --- a/azure-template.yml +++ b/azure-template.yml @@ -1,3 +1,7 @@ +parameters: + exe_suffix: "" + windows: "false" + steps: - bash: npm install eslint typescript@$(TS_VERSION) @typescript-eslint/eslint-plugin @typescript-eslint/parser eslint-config-prettier - ${{ if eq(parameters.windows, 'true') }}: From 8efbec98c3a48f5d3351a175940b09501d2a96c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= Date: Fri, 31 May 2019 19:12:51 +0200 Subject: [PATCH 07/16] use relative path for template --- azure-pipelines.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ca51e469b1bc..76868d11461c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -8,19 +8,19 @@ jobs: pool: vmImage: "Ubuntu-16.04" steps: - - template: azure-template.yml + - template: ./azure-template.yml - job: "Mac" pool: vmImage: "macOS-10.13" steps: - - template: azure-template.yml + - template: ./azure-template.yml - job: "Windows" pool: vmImage: "vs2017-win2016" steps: - - template: azure-template.yml + - template: ./azure-template.yml parameters: exe_suffix: ".exe" windows: "true" From 7b46182d87cc474a7e003822ce95cebfc6477d05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= Date: Fri, 31 May 2019 19:14:53 +0200 Subject: [PATCH 08/16] fix command --- azure-template.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-template.yml b/azure-template.yml index 446f9ff3b37c..4a9d18a61e69 100644 --- a/azure-template.yml +++ b/azure-template.yml @@ -11,5 +11,5 @@ steps: - bash: curl -L https://deno.land/x/install/install.sh | sh -s $(DENO_VERSION) - bash: echo '##vso[task.prependpath]$(HOME)/.deno/bin/' - bash: npx eslint **/*.ts --max-warnings=0 - - bash: ${{ parameters.exe_name }} run --allow-run --allow-write --allow-read format.ts --check - - bash: ${{ parameters.exe_name }} run --allow-run --allow-net --allow-write --allow-read --config=tsconfig.test.json test.ts + - bash: deno${{ parameters.exe_suffix }} run --allow-run --allow-write --allow-read format.ts --check + - bash: deno${{ parameters.exe_suffix }} run --allow-run --allow-net --allow-write --allow-read --config=tsconfig.test.json test.ts From a5d0affc34e0887553c39b305d4cb5d04d06c811 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= Date: Fri, 31 May 2019 19:29:16 +0200 Subject: [PATCH 09/16] split templates --- .ci/template.common.yml | 7 +++++++ .ci/template.linux.yml | 4 ++++ .ci/template.mac.yml | 5 +++++ .ci/template.unix.yml | 3 +++ .ci/template.windows.yml | 9 +++++++++ azure-pipelines.yml | 9 +++------ azure-template.yml | 15 --------------- 7 files changed, 31 insertions(+), 21 deletions(-) create mode 100644 .ci/template.common.yml create mode 100644 .ci/template.linux.yml create mode 100644 .ci/template.mac.yml create mode 100644 .ci/template.unix.yml create mode 100644 .ci/template.windows.yml delete mode 100644 azure-template.yml diff --git a/.ci/template.common.yml b/.ci/template.common.yml new file mode 100644 index 000000000000..2b7098cf9762 --- /dev/null +++ b/.ci/template.common.yml @@ -0,0 +1,7 @@ +parameters: + exe_suffix: "" + +steps: + - bash: npx eslint **/*.ts --max-warnings=0 + - bash: deno${{ parameters.exe_suffix }} run --allow-run --allow-write --allow-read format.ts --check + - bash: deno${{ parameters.exe_suffix }} run --allow-run --allow-net --allow-write --allow-read --config=tsconfig.test.json test.ts \ No newline at end of file diff --git a/.ci/template.linux.yml b/.ci/template.linux.yml new file mode 100644 index 000000000000..2d66638da57b --- /dev/null +++ b/.ci/template.linux.yml @@ -0,0 +1,4 @@ +steps: + - bash: npm install eslint typescript@$(TS_VERSION) @typescript-eslint/eslint-plugin @typescript-eslint/parser eslint-config-prettier + - template: .ci/template.unix.yml + - template: .ci/template.common.yml diff --git a/.ci/template.mac.yml b/.ci/template.mac.yml new file mode 100644 index 000000000000..8bd724a767b3 --- /dev/null +++ b/.ci/template.mac.yml @@ -0,0 +1,5 @@ +steps: + - bash: npm install -g functional-red-black-tree + - bash: npm -g install eslint typescript@$(TS_VERSION) @typescript-eslint/eslint-plugin @typescript-eslint/parser eslint-config-prettier + - template: .ci/template.unix.yml + - template: .ci/template.common.yml diff --git a/.ci/template.unix.yml b/.ci/template.unix.yml new file mode 100644 index 000000000000..aea4e509d894 --- /dev/null +++ b/.ci/template.unix.yml @@ -0,0 +1,3 @@ +steps: + - bash: curl -L https://deno.land/x/install/install.sh | sh -s $(DENO_VERSION) + - bash: echo '##vso[task.prependpath]$(HOME)/.deno/bin/' diff --git a/.ci/template.windows.yml b/.ci/template.windows.yml new file mode 100644 index 000000000000..253f07b0a052 --- /dev/null +++ b/.ci/template.windows.yml @@ -0,0 +1,9 @@ +parameters: + exe_suffix: ".exe" + +steps: + - bash: npm install eslint typescript@$(TS_VERSION) @typescript-eslint/eslint-plugin @typescript-eslint/parser eslint-config-prettier + - powershell: iwr https://deno.land/x/install/install.ps1 -out install.ps1; .\install.ps1 $(DENO_VERSION) + - bash: echo "##vso[task.prependpath]C:\Users\VssAdministrator\.deno\\bin" + - template: .ci/template.unix.yml + - template: .ci/template.common.yml diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 76868d11461c..80102a6d44d8 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -8,19 +8,16 @@ jobs: pool: vmImage: "Ubuntu-16.04" steps: - - template: ./azure-template.yml + - template: .ci/template.linux.yml - job: "Mac" pool: vmImage: "macOS-10.13" steps: - - template: ./azure-template.yml + - template: .ci/template.mac.yml - job: "Windows" pool: vmImage: "vs2017-win2016" steps: - - template: ./azure-template.yml - parameters: - exe_suffix: ".exe" - windows: "true" + - template: .ci/template.windows.yml diff --git a/azure-template.yml b/azure-template.yml deleted file mode 100644 index 4a9d18a61e69..000000000000 --- a/azure-template.yml +++ /dev/null @@ -1,15 +0,0 @@ -parameters: - exe_suffix: "" - windows: "false" - -steps: - - bash: npm install eslint typescript@$(TS_VERSION) @typescript-eslint/eslint-plugin @typescript-eslint/parser eslint-config-prettier - - ${{ if eq(parameters.windows, 'true') }}: - - powershell: iwr https://deno.land/x/install/install.ps1 -out install.ps1; .\install.ps1 $(DENO_VERSION) - - bash: echo "##vso[task.prependpath]C:\Users\VssAdministrator\.deno\\bin" - - ${{ if eq(parameters.windows, 'false') }}: - - bash: curl -L https://deno.land/x/install/install.sh | sh -s $(DENO_VERSION) - - bash: echo '##vso[task.prependpath]$(HOME)/.deno/bin/' - - bash: npx eslint **/*.ts --max-warnings=0 - - bash: deno${{ parameters.exe_suffix }} run --allow-run --allow-write --allow-read format.ts --check - - bash: deno${{ parameters.exe_suffix }} run --allow-run --allow-net --allow-write --allow-read --config=tsconfig.test.json test.ts From 679451ab069800d655f117293678d7cef300b6b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= Date: Fri, 31 May 2019 19:31:25 +0200 Subject: [PATCH 10/16] cleanup --- .ci/template.linux.yml | 4 ++-- .ci/template.mac.yml | 4 ++-- .ci/template.windows.yml | 7 ++----- azure-pipelines.yml | 2 ++ 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.ci/template.linux.yml b/.ci/template.linux.yml index 2d66638da57b..8bf8a30e3d4e 100644 --- a/.ci/template.linux.yml +++ b/.ci/template.linux.yml @@ -1,4 +1,4 @@ steps: - bash: npm install eslint typescript@$(TS_VERSION) @typescript-eslint/eslint-plugin @typescript-eslint/parser eslint-config-prettier - - template: .ci/template.unix.yml - - template: .ci/template.common.yml + - template: ./template.unix.yml + - template: ./template.common.yml diff --git a/.ci/template.mac.yml b/.ci/template.mac.yml index 8bd724a767b3..d179ecd50413 100644 --- a/.ci/template.mac.yml +++ b/.ci/template.mac.yml @@ -1,5 +1,5 @@ steps: - bash: npm install -g functional-red-black-tree - bash: npm -g install eslint typescript@$(TS_VERSION) @typescript-eslint/eslint-plugin @typescript-eslint/parser eslint-config-prettier - - template: .ci/template.unix.yml - - template: .ci/template.common.yml + - template: ./template.unix.yml + - template: ./template.common.yml diff --git a/.ci/template.windows.yml b/.ci/template.windows.yml index 253f07b0a052..66d6a256c88f 100644 --- a/.ci/template.windows.yml +++ b/.ci/template.windows.yml @@ -1,9 +1,6 @@ -parameters: - exe_suffix: ".exe" - steps: - bash: npm install eslint typescript@$(TS_VERSION) @typescript-eslint/eslint-plugin @typescript-eslint/parser eslint-config-prettier - powershell: iwr https://deno.land/x/install/install.ps1 -out install.ps1; .\install.ps1 $(DENO_VERSION) - bash: echo "##vso[task.prependpath]C:\Users\VssAdministrator\.deno\\bin" - - template: .ci/template.unix.yml - - template: .ci/template.common.yml + - template: ./template.unix.yml + - template: ./template.common.yml diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 80102a6d44d8..7ab03ad5a59f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -21,3 +21,5 @@ jobs: vmImage: "vs2017-win2016" steps: - template: .ci/template.windows.yml + parameters: + exe_suffix: ".exe" \ No newline at end of file From e44085caf4ec8f61a0f0e22742a87ebd68704d46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= Date: Fri, 31 May 2019 19:37:14 +0200 Subject: [PATCH 11/16] relative paths --- azure-pipelines.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7ab03ad5a59f..2b33bd9aa744 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -8,18 +8,18 @@ jobs: pool: vmImage: "Ubuntu-16.04" steps: - - template: .ci/template.linux.yml + - template: ./.ci/template.linux.yml - job: "Mac" pool: vmImage: "macOS-10.13" steps: - - template: .ci/template.mac.yml + - template: ./.ci/template.mac.yml - job: "Windows" pool: vmImage: "vs2017-win2016" steps: - - template: .ci/template.windows.yml + - template: ./.ci/template.windows.yml parameters: exe_suffix: ".exe" \ No newline at end of file From 8217ffe885c260f4426335ca43c7f57e54b4b8f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= Date: Fri, 31 May 2019 19:40:52 +0200 Subject: [PATCH 12/16] another test --- azure-pipelines.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2b33bd9aa744..7ab03ad5a59f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -8,18 +8,18 @@ jobs: pool: vmImage: "Ubuntu-16.04" steps: - - template: ./.ci/template.linux.yml + - template: .ci/template.linux.yml - job: "Mac" pool: vmImage: "macOS-10.13" steps: - - template: ./.ci/template.mac.yml + - template: .ci/template.mac.yml - job: "Windows" pool: vmImage: "vs2017-win2016" steps: - - template: ./.ci/template.windows.yml + - template: .ci/template.windows.yml parameters: exe_suffix: ".exe" \ No newline at end of file From e949af5acdc559dbe9ae5d47d8b14368314daaee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= Date: Fri, 31 May 2019 19:48:25 +0200 Subject: [PATCH 13/16] another fix --- .ci/template.common.yml | 1 - .ci/template.linux.yml | 1 + .ci/template.mac.yml | 1 + .ci/template.windows.yml | 2 +- 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.ci/template.common.yml b/.ci/template.common.yml index 2b7098cf9762..2d750c27b25b 100644 --- a/.ci/template.common.yml +++ b/.ci/template.common.yml @@ -2,6 +2,5 @@ parameters: exe_suffix: "" steps: - - bash: npx eslint **/*.ts --max-warnings=0 - bash: deno${{ parameters.exe_suffix }} run --allow-run --allow-write --allow-read format.ts --check - bash: deno${{ parameters.exe_suffix }} run --allow-run --allow-net --allow-write --allow-read --config=tsconfig.test.json test.ts \ No newline at end of file diff --git a/.ci/template.linux.yml b/.ci/template.linux.yml index 8bf8a30e3d4e..8e935a9c84f0 100644 --- a/.ci/template.linux.yml +++ b/.ci/template.linux.yml @@ -1,4 +1,5 @@ steps: - bash: npm install eslint typescript@$(TS_VERSION) @typescript-eslint/eslint-plugin @typescript-eslint/parser eslint-config-prettier - template: ./template.unix.yml + - bash: npx eslint **/*.ts --max-warnings=0 - template: ./template.common.yml diff --git a/.ci/template.mac.yml b/.ci/template.mac.yml index d179ecd50413..81ea6fb357e5 100644 --- a/.ci/template.mac.yml +++ b/.ci/template.mac.yml @@ -2,4 +2,5 @@ steps: - bash: npm install -g functional-red-black-tree - bash: npm -g install eslint typescript@$(TS_VERSION) @typescript-eslint/eslint-plugin @typescript-eslint/parser eslint-config-prettier - template: ./template.unix.yml + - bash: eslint **/*.ts --max-warnings=0 - template: ./template.common.yml diff --git a/.ci/template.windows.yml b/.ci/template.windows.yml index 66d6a256c88f..97f5d5ff991a 100644 --- a/.ci/template.windows.yml +++ b/.ci/template.windows.yml @@ -2,5 +2,5 @@ steps: - bash: npm install eslint typescript@$(TS_VERSION) @typescript-eslint/eslint-plugin @typescript-eslint/parser eslint-config-prettier - powershell: iwr https://deno.land/x/install/install.ps1 -out install.ps1; .\install.ps1 $(DENO_VERSION) - bash: echo "##vso[task.prependpath]C:\Users\VssAdministrator\.deno\\bin" - - template: ./template.unix.yml + - bash: npx eslint **/*.ts --max-warnings=0 - template: ./template.common.yml From d9d00f0b14bd0c5693d2cb2c43a68145be987774 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= Date: Fri, 31 May 2019 19:50:30 +0200 Subject: [PATCH 14/16] reset CI From e6da1d449310643e2328a9dcee54fe0255533277 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= Date: Fri, 31 May 2019 20:21:55 +0200 Subject: [PATCH 15/16] move params to windows template --- .ci/template.windows.yml | 2 ++ azure-pipelines.yml | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/template.windows.yml b/.ci/template.windows.yml index 97f5d5ff991a..f2228993dc7d 100644 --- a/.ci/template.windows.yml +++ b/.ci/template.windows.yml @@ -4,3 +4,5 @@ steps: - bash: echo "##vso[task.prependpath]C:\Users\VssAdministrator\.deno\\bin" - bash: npx eslint **/*.ts --max-warnings=0 - template: ./template.common.yml + parameters: + exe_suffix: ".exe" \ No newline at end of file diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7ab03ad5a59f..80102a6d44d8 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -21,5 +21,3 @@ jobs: vmImage: "vs2017-win2016" steps: - template: .ci/template.windows.yml - parameters: - exe_suffix: ".exe" \ No newline at end of file From 4a90a40d049fc69d4fd7261c9731b9508ee871dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= Date: Fri, 31 May 2019 20:43:38 +0200 Subject: [PATCH 16/16] reset CI