Skip to content

Commit

Permalink
Run the CircleCI Build using Node 12 (#659)
Browse files Browse the repository at this point in the history
* Use signals in "debounces with resolved and rejected promises" test

To improve timing and reliability

Test plan: Test passes with both node 10 and 12 now

* Build using Node 12

Co-authored-by: Chris Hasson <[email protected]>
  • Loading branch information
hassoncs and hassoncs authored Jul 14, 2021
1 parent 0efdd2b commit c6c9b2e
Show file tree
Hide file tree
Showing 10 changed files with 87 additions and 87 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- run: echo $REG_SUIT_EXPECTED_KEY

- run:
command: docker run -v `pwd`:`pwd` -w `pwd` -it --rm -e CI -e CIRCLE_SHA1 -e REG_SUIT_EXPECTED_KEY -e AWS_ACCESS_KEY_ID -e AWS_SECRET_ACCESS_KEY -e AWS_DEFAULT_REGION cruise/webviz-ci:0.0.12 npm run ci
command: docker run -v `pwd`:`pwd` -w `pwd` -it --rm -e CI -e CIRCLE_SHA1 -e REG_SUIT_EXPECTED_KEY -e AWS_ACCESS_KEY_ID -e AWS_SECRET_ACCESS_KEY -e AWS_DEFAULT_REGION cruise/webviz-ci:0.0.13 npm run ci
no_output_timeout: 30m

- save_cache:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-static-webviz
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# This is a static build of just the Webviz application.
# This container is published at https://hub.docker.com/r/cruise/webviz.

FROM node:10.22 AS builder
FROM node:12.22 AS builder

# Copy only the files necessary for installing our package dependencies. This
# way, if the code is updated but the dependencies are the same, we can still
Expand Down
120 changes: 62 additions & 58 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
{
"name": "root",
"private": true,
"engines": {
"node": ">=10.0.0 <12.0.0",
"npm": ">=6.0.0"
},
"devDependencies": {
"@babel/cli": "^7.1.5",
"@babel/core": "^7.2.0",
Expand Down
1 change: 1 addition & 0 deletions packages/regl-worldview/src/utils/queuePromise.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ describe("queuePromise", () => {

expect(calls).toBe(3);
expect(callArgs).toEqual([[1, 2], [3, 4], [5, 6]]);
await Promise.resolve();
expect(queuedFn.currentPromise).toBeUndefined();
});

Expand Down
Loading

0 comments on commit c6c9b2e

Please sign in to comment.