diff --git a/.github/workflows/bashlib.sh b/.github/workflows/bashlib.sh index 44e97d253a040..0f9a8fd10e01b 100644 --- a/.github/workflows/bashlib.sh +++ b/.github/workflows/bashlib.sh @@ -55,8 +55,6 @@ npm-install() { cd "$GITHUB_WORKSPACE/superset-frontend" # cache-restore npm - say "::group::Install npm@7" - sudo npm i -g npm@7 --registry=https://registry.npmjs.org say "::group::Install npm packages" echo "npm: $(npm --version)" echo "node: $(node --version)" diff --git a/.github/workflows/superset-e2e.yml b/.github/workflows/superset-e2e.yml index 3b3898b52091a..ab0d61bf3469a 100644 --- a/.github/workflows/superset-e2e.yml +++ b/.github/workflows/superset-e2e.yml @@ -72,8 +72,7 @@ jobs: if: steps.check.outcome == 'failure' uses: ./.github/actions/cached-dependencies with: - run: | - apt-get-install + run: apt-get-install - name: Install python dependencies if: steps.check.outcome == 'failure' uses: ./.github/actions/cached-dependencies @@ -85,32 +84,31 @@ jobs: if: steps.check.outcome == 'failure' uses: ./.github/actions/cached-dependencies with: - run: | - setup-postgres + run: setup-postgres - name: Import test data if: steps.check.outcome == 'failure' uses: ./.github/actions/cached-dependencies with: - run: | - testdata + run: testdata + - name: Setup Node.js + uses: actions/setup-node@v2 + with: + node-version: '16' - name: Install npm dependencies if: steps.check.outcome == 'failure' uses: ./.github/actions/cached-dependencies with: - run: | - npm-install + run: npm-install - name: Build javascript packages if: steps.check.outcome == 'failure' uses: ./.github/actions/cached-dependencies with: - run: | - build-instrumented-assets + run: build-instrumented-assets - name: Install cypress if: steps.check.outcome == 'failure' uses: ./.github/actions/cached-dependencies with: - run: | - cypress-install + run: cypress-install - name: Run Cypress if: steps.check.outcome == 'failure' uses: ./.github/actions/cached-dependencies diff --git a/.github/workflows/superset-frontend.yml b/.github/workflows/superset-frontend.yml index 670c8155899a4..c4b4e4ef152ee 100644 --- a/.github/workflows/superset-frontend.yml +++ b/.github/workflows/superset-frontend.yml @@ -25,6 +25,10 @@ jobs: PR_NUMBER: ${{ github.event.pull_request.number }} continue-on-error: true run: ./scripts/ci_check_no_file_changes.sh frontend + - name: Setup Node.js + uses: actions/setup-node@v2 + with: + node-version: '16' - name: Install dependencies if: steps.check.outcome == 'failure' uses: ./.github/actions/cached-dependencies diff --git a/.github/workflows/superset-translations.yml b/.github/workflows/superset-translations.yml index 66160fa631261..029c914cf1fc4 100644 --- a/.github/workflows/superset-translations.yml +++ b/.github/workflows/superset-translations.yml @@ -17,6 +17,10 @@ jobs: with: persist-credentials: false submodules: recursive + - name: Setup Node.js + uses: actions/setup-node@v2 + with: + node-version: '16' - name: Install dependencies uses: ./.github/actions/cached-dependencies with: diff --git a/Dockerfile b/Dockerfile index c73e6cad61988..8244f16a11543 100644 --- a/Dockerfile +++ b/Dockerfile @@ -45,7 +45,7 @@ RUN cd /app \ ###################################################################### # Node stage to deal with static asset construction ###################################################################### -FROM node:14 AS superset-node +FROM node:16 AS superset-node ARG NPM_VER=7 RUN npm install -g npm@${NPM_VER} diff --git a/docker-compose.yml b/docker-compose.yml index 93a79809178e5..3131d2384a761 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -102,7 +102,7 @@ services: CYPRESS_CONFIG: "${CYPRESS_CONFIG}" superset-node: - image: node:14 + image: node:16 container_name: superset_node command: ["/app/docker/docker-frontend.sh"] env_file: docker/.env diff --git a/superset-frontend/package.json b/superset-frontend/package.json index 67cd0a3612b47..32c11b3a0d0fc 100644 --- a/superset-frontend/package.json +++ b/superset-frontend/package.json @@ -56,7 +56,7 @@ "last 3 edge versions" ], "engines": { - "node": "^14.15.5", + "node": "^16.9.1", "npm": "^7.5.4" }, "homepage": "https://superset.apache.org/", diff --git a/superset-websocket/Dockerfile b/superset-websocket/Dockerfile index 84c6d28d7df18..85ff66520dd29 100644 --- a/superset-websocket/Dockerfile +++ b/superset-websocket/Dockerfile @@ -12,7 +12,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -FROM node:14.16.1 +FROM node:16 WORKDIR /home/superset-websocket