diff --git a/.cirrus.yml b/.cirrus.yml index ae81bd0970c..7e52c4189b2 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -49,13 +49,14 @@ task: apt-get update apt-get install --yes nodejs node --version && npm --version + npm install --global yarn # Info about Cirrus CI caching see: https://cirrus-ci.org/guide/writing-tasks/#cache-instruction node_modules_cache: folder: /home/ranchertest/src/node_modules - fingerprint_script: cat package-lock.json + fingerprint_script: cat yarn.lock populate_script: # Passing DEBUG=pw:install in order to verify if all Playwright deps were installed properly - - ${SUDO_NON_ROOT_CMD} DEBUG=pw:install npm ci + - ${SUDO_NON_ROOT_CMD} DEBUG=pw:install yarn install --frozen-lockfile # `playwright install-deps` needs to be run as root, as it does apt-get things. - /usr/bin/env --chdir=/home/ranchertest/src ./node_modules/.bin/playwright install-deps diff --git a/.github/workflows/docker-cli-monitor.yaml b/.github/workflows/docker-cli-monitor.yaml index cf2ed308233..746341edd88 100644 --- a/.github/workflows/docker-cli-monitor.yaml +++ b/.github/workflows/docker-cli-monitor.yaml @@ -32,7 +32,7 @@ jobs: with: node-version: '16.x' - - run: npm ci + - run: yarn install --frozen-lockfile - run: yarn dcmonitor env: diff --git a/.github/workflows/macM1-e2e.yaml b/.github/workflows/macM1-e2e.yaml index a5447f7498f..2518350ec75 100644 --- a/.github/workflows/macM1-e2e.yaml +++ b/.github/workflows/macM1-e2e.yaml @@ -24,7 +24,7 @@ jobs: with: go-version: '^1.18' - name: Install dependencies - run: npm ci + run: yarn install --frozen-lockfile #The next steps is a workaround for an unexpected failure in launching electron before running e2e tests #Such failure is addressed in issue #2915 - name: add tools to PATH diff --git a/.github/workflows/package.yaml b/.github/workflows/package.yaml index b4188012d46..48004026214 100644 --- a/.github/workflows/package.yaml +++ b/.github/workflows/package.yaml @@ -52,14 +52,10 @@ jobs: - name: Flag build for M1 if: matrix.arch == 'aarch64' && matrix.platform == 'mac' run: echo "M1=1" >> "${GITHUB_ENV}" - - name: Upgrade npm - # We do this to avoid https://github.com/npm/cli/issues/3079 - run: | - npm install -g npm@9 - npm --version - - run: npm ci + # Needs a network timeout for macos & windows. See https://github.com/yarnpkg/yarn/issues/8242 for more info + - run: yarn install --frozen-lockfile --network-timeout 1000000 - run: yarn build - - run: yarn package -- --${{ matrix.platform }} --publish=never + - run: yarn package --${{ matrix.platform }} --publish=never - name: Build bats.tar.gz if: matrix.platform == 'linux' run: make -C bats bats.tar.gz @@ -163,7 +159,7 @@ jobs: - uses: actions/setup-node@v3 with: node-version: '16.x' - - run: npm ci + - run: yarn install --frozen-lockfile - uses: actions/download-artifact@v3 if: runner.os == 'Windows' with: diff --git a/.github/workflows/rddepman.yaml b/.github/workflows/rddepman.yaml index 3682d84b48b..4a280cabb3c 100644 --- a/.github/workflows/rddepman.yaml +++ b/.github/workflows/rddepman.yaml @@ -33,7 +33,7 @@ jobs: with: node-version: '16.x' - - run: npm ci + - run: yarn install --frozen-lockfile - run: yarn rddepman env: diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 44a88f8f955..3f059337f74 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -11,13 +11,16 @@ jobs: - uses: actions/checkout@v3 with: persist-credentials: false + - uses: actions/setup-python@v4 + with: + python-version: '3.x' - uses: actions/setup-node@v3 with: node-version: '16.x' - uses: actions/setup-go@v4 with: go-version: '^1.18' - - run: npm ci + - run: yarn install --frozen-lockfile - run: yarn build - run: yarn lint:nofix - name: Install shfmt diff --git a/.github/workflows/ucmonitor.yaml b/.github/workflows/ucmonitor.yaml index 2cc2fd8b403..96e39e42c05 100644 --- a/.github/workflows/ucmonitor.yaml +++ b/.github/workflows/ucmonitor.yaml @@ -31,7 +31,7 @@ jobs: with: node-version: '16.x' - - run: npm ci + - run: yarn install --frozen-lockfile - run: yarn ucmonitor env: diff --git a/.github/workflows/upgrade-generate.yaml b/.github/workflows/upgrade-generate.yaml index aef93796f05..5a5ef7577bd 100644 --- a/.github/workflows/upgrade-generate.yaml +++ b/.github/workflows/upgrade-generate.yaml @@ -39,9 +39,9 @@ jobs: - name: Flag build for M1 if: matrix.arch == 'aarch64' && matrix.platform == 'mac' run: echo "M1=1" >> "${GITHUB_ENV}" - - run: npm ci + - run: yarn install --frozen-lockfile - run: yarn build - - run: yarn package -- --${{ matrix.platform }} --publish=never + - run: yarn package --${{ matrix.platform }} --publish=never - name: Upload Windows exe installer if: runner.os == 'Windows' uses: actions/upload-artifact@v3 @@ -87,7 +87,7 @@ jobs: - uses: actions/setup-node@v3 with: node-version: '16.x' - - run: npm ci + - run: yarn install --frozen-lockfile - name: Download installer (exe) id: exe uses: actions/download-artifact@v3 diff --git a/.github/workflows/windows-e2e.yaml b/.github/workflows/windows-e2e.yaml index 9df9de5741d..a8b4ef53a8d 100644 --- a/.github/workflows/windows-e2e.yaml +++ b/.github/workflows/windows-e2e.yaml @@ -36,7 +36,7 @@ jobs: # random. cache-dependency-path: src/go/rdctl/go.sum - name: Install dependencies - run: npm ci + run: yarn install --frozen-lockfile - name: Run e2e Tests run: yarn test:e2e env: