Merge branch 'tim/nodejs_additional_versions' into 'master'

Add Node.JS jobs for non-default versions (v12 and v16) See merge request TankerHQ/sdk-js!723
TankerHQ · Sep 24, 2021 · cc0c5c2 · cc0c5c2
2 parents 8f16155 + 8442fac
commit cc0c5c2
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 3 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -30,13 +30,12 @@ check/linux/chrome:
   tags:
     - linux
 
-check/linux/node:
+.check/linux/node-base:
   extends:
     - .python-yarn-cache
-    - .rules/mr/auto
   stage: check
   script:
-    - poetry run python run-ci.py check --runner node
+    - /usr/local/nvm/nvm-exec poetry run python run-ci.py check --runner node
     - mv coverage/lcov-report lcov-report
   artifacts:
     paths:
@@ -45,6 +44,34 @@ check/linux/node:
   tags:
     - linux
 
+check/linux/node:
+  extends:
+    - .check/linux/node-base
+  rules:
+    - !reference [.rules/mr/auto, rules]
+  variables:
+    NODE_VERSION: 14
+
+check/linux/node-lts:
+  extends:
+    - .check/linux/node-base
+    - .rules/mr/manual/nightly/auto
+  rules:
+    - !reference [.rules/master/nightly, rules]
+    - !reference [.rules/mr/manual, rules]
+  variables:
+    NODE_VERSION: 12
+
+check/linux/node-next:
+  extends:
+    - .check/linux/node-base
+    - .rules/mr/manual/nightly/auto
+  rules:
+    - !reference [.rules/master/nightly, rules]
+    - !reference [.rules/mr/manual, rules]
+  variables:
+    NODE_VERSION: 16
+
 check/macos:
   extends:
     - .rules/mr/auto

diff --git a/run-ci.py b/run-ci.py
@@ -155,6 +155,7 @@ def run_linters() -> None:
 
 
 def run_tests_in_node() -> None:
+    tankerci.js.run_yarn("exec", "--", "node", "--version")
     tankerci.js.run_yarn("coverage")
Original file line number	Diff line number	Diff line change
Expand Up		@@ -155,6 +155,7 @@ def run_linters() -> None:


		def run_tests_in_node() -> None:
		tankerci.js.run_yarn("exec", "--", "node", "--version")
		tankerci.js.run_yarn("coverage")


Expand Down