From e39a165a01a64570d882896857a1a1a5752771eb Mon Sep 17 00:00:00 2001 From: Josh <37798644+joshuaellis@users.noreply.github.com> Date: Tue, 28 Mar 2023 08:41:25 +0100 Subject: [PATCH] chore: add --skip-nx-cache chore: update api tests chore: fix vercel chore: formatting pls chore: dont use run chore: add correct command chore: add correct command --- .github/actions/run-api-tests/script.sh | 2 +- .github/workflows/tests.yml | 22 +++++++++++----------- vercel.json | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/actions/run-api-tests/script.sh b/.github/actions/run-api-tests/script.sh index b40f3a5d2a..9b8c259d2c 100755 --- a/.github/actions/run-api-tests/script.sh +++ b/.github/actions/run-api-tests/script.sh @@ -10,6 +10,6 @@ export JWT_SECRET="aSecret" opts=($DB_OPTIONS) -yarn run build:ts +yarn nx run-many --target=build:ts --nx-ignore-cycles --skip-nx-cache yarn run test:generate-app "${opts[@]}" yarn run test:api --no-generate-app diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b7fc66c963..e73a700d48 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -38,7 +38,7 @@ jobs: - uses: nrwl/nx-set-shas@v3 - run: yarn install --immutable - name: Run build:ts - run: yarn nx run-many --target=build:ts --nx-ignore-cycles + run: yarn nx run-many --target=build:ts --nx-ignore-cycles --skip-nx-cache - name: Run lint run: yarn nx affected --target=lint --parallel --nx-ignore-cycles @@ -63,7 +63,7 @@ jobs: - uses: nrwl/nx-set-shas@v3 - run: yarn install --immutable - name: Run build:ts - run: yarn nx run-many --target=build:ts --nx-ignore-cycles + run: yarn nx run-many --target=build:ts --nx-ignore-cycles --skip-nx-cache - name: Run tests run: yarn nx affected --target=test:unit --nx-ignore-cycles @@ -86,7 +86,7 @@ jobs: path: '**/node_modules' key: ${{ runner.os }}-${{ matrix.node }}-${{ hashFiles('**/yarn.lock') }} - uses: nrwl/nx-set-shas@v3 - - run: yarn install --immutable + - run: yarn install --immutable - name: Run test run: yarn nx affected --target=test:front --nx-ignore-cycles @@ -106,7 +106,7 @@ jobs: with: path: '**/node_modules' key: ${{ runner.os }}-${{ matrix.node }}-${{ hashFiles('**/yarn.lock') }} - - run: yarn install --immutable + - run: yarn install --immutable - name: Build run: yarn build --projects=@strapi/admin,@strapi/helper-plugin @@ -145,7 +145,7 @@ jobs: with: path: '**/node_modules' key: ${{ runner.os }}-${{ matrix.node }}-${{ hashFiles('**/yarn.lock') }} - - run: yarn install --immutable + - run: yarn install --immutable - uses: ./.github/actions/run-api-tests with: dbOptions: '--dbclient=postgres --dbhost=localhost --dbport=5432 --dbname=strapi_test --dbusername=strapi --dbpassword=strapi' @@ -183,7 +183,7 @@ jobs: with: path: '**/node_modules' key: ${{ runner.os }}-${{ matrix.node }}-${{ hashFiles('**/yarn.lock') }} - - run: yarn install --immutable + - run: yarn install --immutable - uses: ./.github/actions/run-api-tests with: dbOptions: '--dbclient=mysql --dbhost=localhost --dbport=3306 --dbname=strapi_test --dbusername=strapi --dbpassword=strapi' @@ -220,7 +220,7 @@ jobs: with: path: '**/node_modules' key: ${{ runner.os }}-${{ matrix.node }}-${{ hashFiles('**/yarn.lock') }} - - run: yarn install --immutable + - run: yarn install --immutable - uses: ./.github/actions/run-api-tests with: dbOptions: '--dbclient=mysql --dbhost=localhost --dbport=3306 --dbname=strapi_test --dbusername=strapi --dbpassword=strapi' @@ -242,7 +242,7 @@ jobs: with: path: '**/node_modules' key: ${{ runner.os }}-${{ matrix.node }}-${{ hashFiles('**/yarn.lock') }} - - run: yarn install --immutable + - run: yarn install --immutable - uses: ./.github/actions/run-api-tests env: SQLITE_PKG: ${{ matrix.sqlite_pkg }} @@ -288,7 +288,7 @@ jobs: with: path: '**/node_modules' key: ${{ runner.os }}-${{ matrix.node }}-${{ hashFiles('**/yarn.lock') }} - - run: yarn install --immutable + - run: yarn install --immutable - uses: ./.github/actions/run-api-tests with: dbOptions: '--dbclient=postgres --dbhost=localhost --dbport=5432 --dbname=strapi_test --dbusername=strapi --dbpassword=strapi' @@ -330,7 +330,7 @@ jobs: with: path: '**/node_modules' key: ${{ runner.os }}-${{ matrix.node }}-${{ hashFiles('**/yarn.lock') }} - - run: yarn install --immutable + - run: yarn install --immutable - uses: ./.github/actions/run-api-tests with: dbOptions: '--dbclient=mysql --dbhost=localhost --dbport=3306 --dbname=strapi_test --dbusername=strapi --dbpassword=strapi' @@ -356,7 +356,7 @@ jobs: with: path: '**/node_modules' key: ${{ runner.os }}-${{ matrix.node }}-${{ hashFiles('**/yarn.lock') }} - - run: yarn install --immutable + - run: yarn install --immutable - uses: ./.github/actions/run-api-tests env: SQLITE_PKG: ${{ matrix.sqlite_pkg }} diff --git a/vercel.json b/vercel.json index 3c4adb25e4..77f6c2a272 100644 --- a/vercel.json +++ b/vercel.json @@ -4,7 +4,7 @@ "silent": true, "autoJobCancelation": true }, - "installCommand": "yarn setup", + "installCommand": "yarn install --immutable", "ignoreCommand": "git diff HEAD^ HEAD --quiet './packages/core/helper-plugin'", "outputDirectory": "packages/core/helper-plugin/storybook-static" }