From 58c18601e2dceff9d682603e17ed7ca0dcda5a8f Mon Sep 17 00:00:00 2001 From: MarkLark86 Date: Wed, 25 May 2022 15:55:27 +1000 Subject: [PATCH] fix(ci): Lock cheerio version to 1.0.0-rc10 (#1687) * test: failing client tests * Limit NodeJS to version 14.19.1 * fix: Slow npm install * use latest NodeJS v14 * run `npm list` * ignore `npm list` return code * lock cheerio version https://github.com/cheeriojs/cheerio/issues/2545 --- .github/workflows/ci-client.yml | 3 ++- README.md | 1 + package.json | 1 + scripts/ci-install.sh | 2 ++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci-client.yml b/.github/workflows/ci-client.yml index ea2afe5f8..155ac36b4 100644 --- a/.github/workflows/ci-client.yml +++ b/.github/workflows/ci-client.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: [12.x, 14.x] + node-version: [14.x] env: INSTALL_NODE_MODULES: true steps: @@ -44,5 +44,6 @@ jobs: run: ./scripts/ci-start-services.sh # avoid file watch limit error - run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p + - run: npm list || true - name: test run: npm run test diff --git a/README.md b/README.md index 43a1582e5..56070aaa1 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ +. # Superdesk Planning [![Build Status](https://travis-ci.org/superdesk/superdesk-planning.svg?branch=master)](https://travis-ci.org/superdesk/superdesk-planning) [![Coverage Status](https://coveralls.io/repos/github/superdesk/superdesk-planning/badge.svg?branch=master)](https://coveralls.io/github/superdesk/superdesk-planning?branch=master) diff --git a/package.json b/package.json index 1821acdfe..14d417cf3 100644 --- a/package.json +++ b/package.json @@ -44,6 +44,7 @@ "@types/sinon": "^9.0.4", "@typescript-eslint/parser": "2.6.1", "btoa": "^1.1.2", + "cheerio": "1.0.0-rc.10", "enzyme": "~3.11.0", "enzyme-adapter-react-16": "^1.15.5", "eslint": "6.6.0", diff --git a/scripts/ci-install.sh b/scripts/ci-install.sh index 8c28bd633..df9bfa5ca 100755 --- a/scripts/ci-install.sh +++ b/scripts/ci-install.sh @@ -8,6 +8,7 @@ sudo apt-get -y install libxml2-dev libxmlsec1-dev libxmlsec1-openssl python -m pip install --upgrade 'pip<21.3' wheel setuptools if [ "$INSTALL_NODE_MODULES" == "true" ]; then + git config --global url."https://git@".insteadOf git:// npm install fi @@ -25,5 +26,6 @@ if [ "$E2E" == "true" ]; then cd e2e/server pip install -r requirements.txt cd ../ + git config --global url."https://git@".insteadOf git:// npm install fi