From d52e82f7b0f314f1ef577897d2c3be190fb870c9 Mon Sep 17 00:00:00 2001 From: Jonathan Roebuck Date: Thu, 18 Feb 2021 14:09:27 +0000 Subject: [PATCH] add yarn ci script to remove invalid transitive dependencies before new install --- .github/workflows/simorgh-deploy-storybook.yml | 2 +- .github/workflows/simorgh-integration-tests.yml | 2 +- .github/workflows/simorgh-local-server-tests.yml | 2 +- .github/workflows/simorgh-misc-checks.yml | 2 +- .github/workflows/simorgh-unit-tests.yml | 2 +- codebuild/e2e_buildspec.yml | 2 +- package.json | 1 + 7 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/simorgh-deploy-storybook.yml b/.github/workflows/simorgh-deploy-storybook.yml index 8edad6c2a20..a489b77a4dd 100644 --- a/.github/workflows/simorgh-deploy-storybook.yml +++ b/.github/workflows/simorgh-deploy-storybook.yml @@ -25,7 +25,7 @@ jobs: - name: Install Node Modules if: steps.cache.outputs.cache-hit != 'true' - run: yarn install --frozen-lockfile + run: yarn ci - name: Build Storybook run: | diff --git a/.github/workflows/simorgh-integration-tests.yml b/.github/workflows/simorgh-integration-tests.yml index 6287fee2c52..9663df8ec12 100644 --- a/.github/workflows/simorgh-integration-tests.yml +++ b/.github/workflows/simorgh-integration-tests.yml @@ -36,7 +36,7 @@ jobs: - name: Install Node Modules if: steps.cache.outputs.cache-hit != 'true' - run: yarn install --frozen-lockfile + run: yarn install ci - name: Integration Tests run: yarn test:integration -- --ci diff --git a/.github/workflows/simorgh-local-server-tests.yml b/.github/workflows/simorgh-local-server-tests.yml index 6928fcae8c8..197c31e23e7 100644 --- a/.github/workflows/simorgh-local-server-tests.yml +++ b/.github/workflows/simorgh-local-server-tests.yml @@ -35,7 +35,7 @@ jobs: - name: Install Node Modules if: steps.cache.outputs.cache-hit != 'true' - run: yarn install --frozen-lockfile + run: yarn install ci - name: Build Simorgh run: yarn build:local diff --git a/.github/workflows/simorgh-misc-checks.yml b/.github/workflows/simorgh-misc-checks.yml index acb0f56ac97..3025322c316 100644 --- a/.github/workflows/simorgh-misc-checks.yml +++ b/.github/workflows/simorgh-misc-checks.yml @@ -37,7 +37,7 @@ jobs: - name: Install Node Modules if: steps.cache.outputs.cache-hit != 'true' - run: yarn install --frozen-lockfile + run: yarn install ci - name: Chromatic UI Tests uses: chromaui/action@v1 diff --git a/.github/workflows/simorgh-unit-tests.yml b/.github/workflows/simorgh-unit-tests.yml index 0c9745b11d5..1af95a7a720 100644 --- a/.github/workflows/simorgh-unit-tests.yml +++ b/.github/workflows/simorgh-unit-tests.yml @@ -47,7 +47,7 @@ jobs: - name: Install Node Modules if: steps.cache.outputs.cache-hit != 'true' - run: yarn install --frozen-lockfile + run: yarn install ci - name: Build Simorgh run: | diff --git a/codebuild/e2e_buildspec.yml b/codebuild/e2e_buildspec.yml index c2d892f5fd8..40927fdf7cf 100644 --- a/codebuild/e2e_buildspec.yml +++ b/codebuild/e2e_buildspec.yml @@ -10,7 +10,7 @@ phases: nodejs: 12 pre_build: commands: - - yarn install --frozen-lockfile + - yarn install ci - yarn build build: commands: diff --git a/package.json b/package.json index c1725f37812..8bdaf20499d 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "build:storybook": "build-storybook -s .storybook/static -c .storybook -o storybook_dist", "build:test": "cp envConfig/test.env .env && NODE_ENV=production webpack", "build:test:debug": "rm -rf build && awk '{sub(/LOG_DIR=.+/,\"LOG_DIR='log'\")}1' envConfig/test.env > .env && NODE_ENV=production webpack", + "ci": "rm -rf node_modules && yarn install --frozen-lockfile", "cypress": "cypress run", "cypress:interactive": "cypress open", "cypress:3rdParty": "yarn cypress -- --project ./3rdPartyCypress/.",