Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: make CI config DRY #470

Merged
merged 16 commits into from
May 31, 2019
Merged

chore: make CI config DRY #470

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
fcda558
make CI config DRY
bartlomieju May 30, 2019
3f82844
use bash for unix pipelines
bartlomieju May 31, 2019
a2246be
use conditional in template
bartlomieju May 31, 2019
1cc60dd
parameters before steps
bartlomieju May 31, 2019
01a7dcf
parameters under template
bartlomieju May 31, 2019
1177896
dedup further
bartlomieju May 31, 2019
8efbec9
use relative path for template
bartlomieju May 31, 2019
7b46182
fix command
bartlomieju May 31, 2019
a5d0aff
split templates
bartlomieju May 31, 2019
679451a
cleanup
bartlomieju May 31, 2019
e44085c
relative paths
bartlomieju May 31, 2019
8217ffe
another test
bartlomieju May 31, 2019
e949af5
another fix
bartlomieju May 31, 2019
d9d00f0
reset CI
bartlomieju May 31, 2019
e6da1d4
move params to windows template
bartlomieju May 31, 2019
4a90a40
reset CI
bartlomieju May 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .ci/steps.unix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
bartlomieju marked this conversation as resolved.
Show resolved Hide resolved
7 changes: 7 additions & 0 deletions .ci/steps.win.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
steps:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd refer ci directory to .ci

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought about it, but won't it be confusing for users? It'll look like one of the available modules.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok good point

- 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
29 changes: 9 additions & 20 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"