@@ -19,12 +19,17 @@ workflows:
1919 filters :
2020 tags :
2121 only : /.*/
22+ - node10 :
23+ filters :
24+ tags :
25+ only : /.*/
2226 - lint :
2327 requires :
2428 - node4
2529 - node6
2630 - node8
2731 - node9
32+ - node10
2833 filters :
2934 tags :
3035 only : /.*/
@@ -34,6 +39,7 @@ workflows:
3439 - node6
3540 - node8
3641 - node9
42+ - node10
3743 filters :
3844 tags :
3945 only : /.*/
@@ -89,14 +95,15 @@ jobs:
8995 else
9096 echo "Not a nightly build, skipping this step."
9197 fi
92- - run :
93- name : Install modules and dependencies .
94- command : |-
98+ - run : &npm_install_and_link
99+ name : Install and link the module .
100+ command : |
95101 npm install
96102 repo_tools="node_modules/@google-cloud/nodejs-repo-tools/bin/tools"
97103 if ! test -x "$repo_tools"; then
98104 chmod +x "$repo_tools"
99105 fi
106+ npm link
100107 - run :
101108 name : Run unit tests.
102109 command : npm test
@@ -116,22 +123,18 @@ jobs:
116123 docker :
117124 - image : ' node:9'
118125 steps : *unit_tests_steps
126+ node10 :
127+ docker :
128+ - image : ' node:10'
129+ steps : *unit_tests_steps
119130 lint :
120131 docker :
121132 - image : ' node:8'
122133 steps :
123134 - checkout
124135 - run : *remove_package_lock
125- - run :
126- name : Install modules and dependencies.
127- command : |
128- npm install
129- repo_tools="node_modules/@google-cloud/nodejs-repo-tools/bin/tools"
130- if ! test -x "$repo_tools"; then
131- chmod +x "$repo_tools"
132- fi
133- npm link
134- - run :
136+ - run : *npm_install_and_link
137+ - run : &samples_npm_install_and_link
135138 name : Link the module being tested to the samples.
136139 command : |
137140 cd samples/
@@ -147,14 +150,7 @@ jobs:
147150 steps :
148151 - checkout
149152 - run : *remove_package_lock
150- - run :
151- name : Install modules and dependencies.
152- command : |-
153- npm install
154- repo_tools="node_modules/@google-cloud/nodejs-repo-tools/bin/tools"
155- if ! test -x "$repo_tools"; then
156- chmod +x "$repo_tools"
157- fi
153+ - run : *npm_install_and_link
158154 - run :
159155 name : Build documentation.
160156 command : npm run docs
@@ -170,22 +166,8 @@ jobs:
170166 openssl aes-256-cbc -d -in .circleci/key.json.enc \
171167 -out .circleci/key.json \
172168 -k "${SYSTEM_TESTS_ENCRYPTION_KEY}"
173- - run :
174- name : Install and link the module.
175- command : |
176- npm install
177- repo_tools="node_modules/@google-cloud/nodejs-repo-tools/bin/tools"
178- if ! test -x "$repo_tools"; then
179- chmod +x "$repo_tools"
180- fi
181- npm link
182- - run :
183- name : Link the module being tested to the samples.
184- command : |
185- cd samples/
186- npm link @google-cloud/resource
187- npm install
188- cd ..
169+ - run : *npm_install_and_link
170+ - run : *samples_npm_install_and_link
189171 - run :
190172 name : Run sample tests.
191173 command : npm run samples-test
@@ -209,14 +191,7 @@ jobs:
209191 openssl aes-256-cbc -d -in .circleci/key.json.enc \
210192 -out .circleci/key.json \
211193 -k "${SYSTEM_TESTS_ENCRYPTION_KEY}"
212- - run :
213- name : Install modules and dependencies.
214- command : |-
215- npm install
216- repo_tools="node_modules/@google-cloud/nodejs-repo-tools/bin/tools"
217- if ! test -x "$repo_tools"; then
218- chmod +x "$repo_tools"
219- fi
194+ - run : *npm_install_and_link
220195 - run :
221196 name : Run system tests.
222197 command : npm run system-test
0 commit comments