From 28fc0474d8abf35f1ab64dac9e4fb8c1a62e29a7 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 28 Sep 2021 10:13:53 +0200 Subject: [PATCH] Update workflow and devcontainer to Node 14 (#19508) --- .devcontainer/devcontainer.json | 6 +++--- .github/workflows/test.yml | 24 ++++++------------------ 2 files changed, 9 insertions(+), 21 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 71baa4c3b93..806ae1c93b0 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -5,12 +5,12 @@ "context": "..", "args": { "VARIANT": "2.7", - "NODE_VERSION": "12.1", + "NODE_VERSION": "14" } }, "appPort": [4000], "postCreateCommand": "bundle install && npm install", - "containerEnv": {"DEVCONTAINER": "true"}, + "containerEnv": { "DEVCONTAINER": "true" }, "extensions": [ "davidanson.vscode-markdownlint", "editorconfig.editorconfig", @@ -25,6 +25,6 @@ "errorLens.gutterIconsEnabled": true, "errorLens.addAnnotationTextPrefixes": false, "errorLens.enabledDiagnosticLevels": ["error", "warning"], - "terminal.integrated.shell.linux": "/usr/bin/zsh", + "terminal.integrated.shell.linux": "/usr/bin/zsh" } } diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a7889400138..3396416ed47 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,17 +9,11 @@ jobs: steps: - name: Check out files from GitHub uses: actions/checkout@v2.3.4 - - name: Setting up Node.js ${{ matrix.node-version }} + - name: Setting up Node.js uses: actions/setup-node@v2.4.0 with: - node-version: 12.x - - name: Setup NPM cache - uses: actions/cache@v2.1.6 - with: - path: ~/.npm - key: npm-${{ hashFiles('**/package-lock.json') }} - restore-keys: | - npm- + node-version: 14.x + cache: "npm" - name: Install dependencies run: npm install env: @@ -32,17 +26,11 @@ jobs: steps: - name: Check out files from GitHub uses: actions/checkout@v2.3.4 - - name: Setting up Node.js ${{ matrix.node-version }} + - name: Setting up Node.js uses: actions/setup-node@v2.4.0 with: - node-version: 12.x - - name: Setup NPM cache - uses: actions/cache@v2.1.6 - with: - path: ~/.npm - key: npm-${{ hashFiles('**/package-lock.json') }} - restore-keys: | - npm- + node-version: 14.x + cache: "npm" - name: Install dependencies run: npm install env: