From 94579b9dc2f1e77df31ed44f799ec1c1545c770c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Tue, 25 Sep 2018 20:11:30 +0100 Subject: [PATCH 1/2] chore(ci): use nvmrc & npmrc to set nodejs/npm version/options --- .npmrc | 1 + .nvmrc | 1 + .travis.yml | 5 +---- 3 files changed, 3 insertions(+), 4 deletions(-) create mode 100644 .npmrc create mode 100644 .nvmrc diff --git a/.npmrc b/.npmrc new file mode 100644 index 000000000..cffe8cdef --- /dev/null +++ b/.npmrc @@ -0,0 +1 @@ +save-exact=true diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 000000000..2f9417a58 --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +8.11.4 diff --git a/.travis.yml b/.travis.yml index f1e466c80..8c35ceffb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,9 +7,6 @@ defaults_go: &DEFAULTS_GO defaults_js: &DEFAULTS_JS language: node_js - # FIXME 8.12 includes npm 6.4.1 which generates a different lock file on - # macOS and Linux, causing diffs on CI and we fail builds when that happens - node_js: "8.11.4" # FIXME same in the 'Build and Deploy' stage # install defaults to "npm install", which is done via make install: [] cache: @@ -65,7 +62,7 @@ jobs: before_script: # this stage needs to build everything including assets file and that # requires running webpack, so we need nodejs here - - nvm install 8.11.4 + - nvm install $(< .nvmrc) script: # compile assets via webpack and build those into bindata_assetfs.go file - make bindata_assetfs.go From 4850a495d9c259f8f489583648d1a626e8eebd56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Tue, 25 Sep 2018 20:17:50 +0100 Subject: [PATCH 2/2] fix(docker): use nodejs 8.11.4 instead of latest 8.x --- Dockerfile | 2 +- demo/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1f3bda8c3..6131c3e9d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:8-alpine as nodejs-builder +FROM node:8.11.4-alpine as nodejs-builder RUN apk add --update make git COPY . /karma RUN make -C /karma ui diff --git a/demo/Dockerfile b/demo/Dockerfile index 956b7eb90..8f0b41f5a 100644 --- a/demo/Dockerfile +++ b/demo/Dockerfile @@ -1,4 +1,4 @@ -FROM node:8-alpine as nodejs-builder +FROM node:8.11.4-alpine as nodejs-builder RUN apk add --update make git COPY . /karma RUN make -C /karma ui