summary refs log tree commit diff stats
path: root/azure-pipelines.yml
diff options
context:
space:
mode:
authorTimothee Cour <timothee.cour2@gmail.com>2021-05-26 00:43:30 -0700
committerGitHub <noreply@github.com>2021-05-26 09:43:30 +0200
commitc495628255330a559e3398663cc8872cca18b04d (patch)
treecf85c44fe30068263515dbfe53709ebc508c56de /azure-pipelines.yml
parentb59dc3b255d778cefdbef2c0c3ff55d43892c11c (diff)
downloadNim-c495628255330a559e3398663cc8872cca18b04d.tar.gz
refactor common code in CI pipelines (#18035)
* refactor CI with nimInternalInstallDepsWindows

* refactor CI with nimInternalBuildKochAndRunCI

* fixup
Diffstat (limited to 'azure-pipelines.yml')
-rw-r--r--azure-pipelines.yml16
1 files changed, 4 insertions, 12 deletions
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 112fb0a62..f0c3b2d0a 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -133,11 +133,7 @@ jobs:
     - bash: |
         set -e
         . ci/funs.sh
-        echo_run mkdir dist
-        echo_run curl -L https://nim-lang.org/download/mingw64.7z -o dist/mingw64.7z
-        echo_run curl -L https://nim-lang.org/download/dlls.zip -o dist/dlls.zip
-        echo_run 7z x dist/mingw64.7z -odist
-        echo_run 7z x dist/dlls.zip -obin
+        nimInternalInstallDepsWindows
         echo_run echo '##vso[task.prependpath]$(System.DefaultWorkingDirectory)/dist/mingw64/bin'
 
       displayName: 'Install dependencies (Windows)'
@@ -163,13 +159,9 @@ jobs:
     #   condition: and(succeeded(), eq(variables['skipci'], 'false'))
     #   displayName: 'Restore built csourcesAny'
 
-    - bash: nim c koch
+    - bash: . ci/funs.sh && nimInternalBuildKochAndRunCI
+      # would could also show on failure: echo '##vso[task.complete result=Failed]'
       condition: and(succeeded(), eq(variables['skipci'], 'false'))
-      displayName: 'Build koch'
-
-      # set result to omit the "bash exited with error code '1'" message
-    - bash: ./koch runCI || echo '##vso[task.complete result=Failed]'
-      condition: and(succeeded(), eq(variables['skipci'], 'false'))
-      displayName: 'Run CI'
+      displayName: 'koch, Run CI'
       env:
         SYSTEM_ACCESSTOKEN: $(System.AccessToken)