From 6fb350f959af6b9d6d21a842c3cefd2c327e8c1a Mon Sep 17 00:00:00 2001 From: Andrew Goldis Date: Tue, 23 Jan 2024 17:01:14 -0800 Subject: [PATCH] fix: use block-free binary for ci tests --- .circleci/_config.yml | 2 +- .github/_workflows_/e2e-smoke-linux.yml | 58 ------------------- .github/e2e-smoke-windows.yaml | 2 +- .../benchmark-cloud.yml | 2 +- .../benchmark-cy.yml | 2 +- .../e2e-config-esm-cjs.yml | 2 +- .../e2e-config-esm-js.yml | 2 +- .../e2e-config-esm-mjs.yml | 2 +- .../e2e-config-noesm-js.yml | 2 +- .../e2e-exports.yml | 2 +- .../e2e-monorepo.yml | 2 +- .../e2e-smoke-api.yml | 2 +- .../e2e-smoke-component.yml | 2 +- .github/workflows/e2e-smoke-linux.yml | 4 +- .github/{_workflows_ => workflows}/lint.yml | 0 .../{_workflows_ => workflows}/unit-tests.yml | 0 16 files changed, 14 insertions(+), 72 deletions(-) delete mode 100644 .github/_workflows_/e2e-smoke-linux.yml rename .github/{_workflows_ => workflows}/benchmark-cloud.yml (97%) rename .github/{_workflows_ => workflows}/benchmark-cy.yml (97%) rename .github/{_workflows_ => workflows}/e2e-config-esm-cjs.yml (97%) rename .github/{_workflows_ => workflows}/e2e-config-esm-js.yml (97%) rename .github/{_workflows_ => workflows}/e2e-config-esm-mjs.yml (97%) rename .github/{_workflows_ => workflows}/e2e-config-noesm-js.yml (97%) rename .github/{_workflows_ => workflows}/e2e-exports.yml (95%) rename .github/{_workflows_ => workflows}/e2e-monorepo.yml (97%) rename .github/{_workflows_ => workflows}/e2e-smoke-api.yml (97%) rename .github/{_workflows_ => workflows}/e2e-smoke-component.yml (97%) rename .github/{_workflows_ => workflows}/lint.yml (100%) rename .github/{_workflows_ => workflows}/unit-tests.yml (100%) diff --git a/.circleci/_config.yml b/.circleci/_config.yml index 97bae5ac..adb9a22d 100644 --- a/.circleci/_config.yml +++ b/.circleci/_config.yml @@ -41,7 +41,7 @@ jobs: key: v5-deps-{{ checksum "package-lock.json" }} - name: Install alternative cypress binaries - run: CYPRESS_DOWNLOAD_MIRROR=https://cy-cdn.currents.dev npx cypress install --force + run: CYPRESS_DOWNLOAD_MIRROR=https://cy-cdn.currents.dev npx cypress install@12.17.4 --force - run: npm install - save_cache: diff --git a/.github/_workflows_/e2e-smoke-linux.yml b/.github/_workflows_/e2e-smoke-linux.yml deleted file mode 100644 index 91fdfa65..00000000 --- a/.github/_workflows_/e2e-smoke-linux.yml +++ /dev/null @@ -1,58 +0,0 @@ -name: e2e-smoke-linux - -on: - push: - -jobs: - e2e-smoke: - if: "!contains(toJSON(github.event.commits.*.message), '[skip ci]')" - runs-on: ubuntu-latest - env: - DEBUG: currents:* - - services: - director: - image: agoldis/sorry-cypress-director - ports: - - 1234:1234 - - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 - with: - node-version: "16" - - - name: Install alternative cypress binaries - run: CYPRESS_DOWNLOAD_MIRROR=https://cy-cdn.currents.dev npx cypress install --force - - - name: Install dependencies - run: npm ci - - - name: Build - run: npm run build - - - name: Link monorepo packages - run: npm install - - - name: Run Cypress with cypress-cloud - working-directory: ./examples/webapp - env: - CURRENTS_API_URL: http://localhost:1234 - run: > - npx cypress-cloud run - --record - --parallel - --key some-key - --browser chrome - --tag smoke,linux - --spec "./cypress/e2e_smoke/*.spec.js" - --ci-build-id "smoke-linux-${{ github.repository }}-${{ github.run_id }}-${{ github.run_attempt}}" - - - name: Run in Offline mode - working-directory: ./examples/webapp - run: > - npx cypress-cloud run - --record false - --browser chrome - --tag smoke,linux - --spec "./cypress/e2e_smoke/*.spec.js" diff --git a/.github/e2e-smoke-windows.yaml b/.github/e2e-smoke-windows.yaml index ce9d2864..5582f612 100644 --- a/.github/e2e-smoke-windows.yaml +++ b/.github/e2e-smoke-windows.yaml @@ -19,7 +19,7 @@ jobs: node-version: "16" - name: Install alternative cypress binaries - run: CYPRESS_DOWNLOAD_MIRROR=https://cy-cdn.currents.dev npx cypress install --force + run: CYPRESS_DOWNLOAD_MIRROR=https://cy-cdn.currents.dev npx cypress install@12.17.4 --force - name: Install dependencies run: npm ci diff --git a/.github/_workflows_/benchmark-cloud.yml b/.github/workflows/benchmark-cloud.yml similarity index 97% rename from .github/_workflows_/benchmark-cloud.yml rename to .github/workflows/benchmark-cloud.yml index 65b5de35..052dc466 100644 --- a/.github/_workflows_/benchmark-cloud.yml +++ b/.github/workflows/benchmark-cloud.yml @@ -28,7 +28,7 @@ jobs: cache: "npm" - name: Install alternative cypress binaries - run: CYPRESS_DOWNLOAD_MIRROR=https://cy-cdn.currents.dev npx cypress install --force + run: CYPRESS_DOWNLOAD_MIRROR=https://cy-cdn.currents.dev npx cypress install@12.17.4 --force - name: Install dependencies run: npm install diff --git a/.github/_workflows_/benchmark-cy.yml b/.github/workflows/benchmark-cy.yml similarity index 97% rename from .github/_workflows_/benchmark-cy.yml rename to .github/workflows/benchmark-cy.yml index 51b14ad4..c3baf12c 100644 --- a/.github/_workflows_/benchmark-cy.yml +++ b/.github/workflows/benchmark-cy.yml @@ -28,7 +28,7 @@ jobs: cache: "npm" - name: Install alternative cypress binaries - run: CYPRESS_DOWNLOAD_MIRROR=https://cy-cdn.currents.dev npx cypress install --force + run: CYPRESS_DOWNLOAD_MIRROR=https://cy-cdn.currents.dev npx cypress install@12.17.4 --force - name: Install dependencies run: npm install diff --git a/.github/_workflows_/e2e-config-esm-cjs.yml b/.github/workflows/e2e-config-esm-cjs.yml similarity index 97% rename from .github/_workflows_/e2e-config-esm-cjs.yml rename to .github/workflows/e2e-config-esm-cjs.yml index f7ebe59b..6361d209 100644 --- a/.github/_workflows_/e2e-config-esm-cjs.yml +++ b/.github/workflows/e2e-config-esm-cjs.yml @@ -27,7 +27,7 @@ jobs: node-version: ${{ matrix.node-version }} - name: Install alternative cypress binaries - run: CYPRESS_DOWNLOAD_MIRROR=https://cy-cdn.currents.dev npx cypress install --force + run: CYPRESS_DOWNLOAD_MIRROR=https://cy-cdn.currents.dev npx cypress install@12.17.4 --force - name: Install dependencies run: npm ci diff --git a/.github/_workflows_/e2e-config-esm-js.yml b/.github/workflows/e2e-config-esm-js.yml similarity index 97% rename from .github/_workflows_/e2e-config-esm-js.yml rename to .github/workflows/e2e-config-esm-js.yml index eefb768a..a95c2850 100644 --- a/.github/_workflows_/e2e-config-esm-js.yml +++ b/.github/workflows/e2e-config-esm-js.yml @@ -27,7 +27,7 @@ jobs: node-version: ${{ matrix.node-version }} - name: Install alternative cypress binaries - run: CYPRESS_DOWNLOAD_MIRROR=https://cy-cdn.currents.dev npx cypress install --force + run: CYPRESS_DOWNLOAD_MIRROR=https://cy-cdn.currents.dev npx cypress install@12.17.4 --force - name: Install dependencies run: npm ci diff --git a/.github/_workflows_/e2e-config-esm-mjs.yml b/.github/workflows/e2e-config-esm-mjs.yml similarity index 97% rename from .github/_workflows_/e2e-config-esm-mjs.yml rename to .github/workflows/e2e-config-esm-mjs.yml index 90d3d69a..6260b4ce 100644 --- a/.github/_workflows_/e2e-config-esm-mjs.yml +++ b/.github/workflows/e2e-config-esm-mjs.yml @@ -27,7 +27,7 @@ jobs: node-version: ${{ matrix.node-version }} - name: Install alternative cypress binaries - run: CYPRESS_DOWNLOAD_MIRROR=https://cy-cdn.currents.dev npx cypress install --force + run: CYPRESS_DOWNLOAD_MIRROR=https://cy-cdn.currents.dev npx cypress install@12.17.4 --force - name: Install dependencies run: npm ci diff --git a/.github/_workflows_/e2e-config-noesm-js.yml b/.github/workflows/e2e-config-noesm-js.yml similarity index 97% rename from .github/_workflows_/e2e-config-noesm-js.yml rename to .github/workflows/e2e-config-noesm-js.yml index 9ad8cc90..7c35988c 100644 --- a/.github/_workflows_/e2e-config-noesm-js.yml +++ b/.github/workflows/e2e-config-noesm-js.yml @@ -27,7 +27,7 @@ jobs: node-version: ${{ matrix.node-version }} - name: Install alternative cypress binaries - run: CYPRESS_DOWNLOAD_MIRROR=https://cy-cdn.currents.dev npx cypress install --force + run: CYPRESS_DOWNLOAD_MIRROR=https://cy-cdn.currents.dev npx cypress install@12.17.4 --force - name: Install dependencies run: npm ci diff --git a/.github/_workflows_/e2e-exports.yml b/.github/workflows/e2e-exports.yml similarity index 95% rename from .github/_workflows_/e2e-exports.yml rename to .github/workflows/e2e-exports.yml index 05544919..68994f95 100644 --- a/.github/_workflows_/e2e-exports.yml +++ b/.github/workflows/e2e-exports.yml @@ -21,7 +21,7 @@ jobs: node-version: ${{ matrix.node-version }} - name: Install alternative cypress binaries - run: CYPRESS_DOWNLOAD_MIRROR=https://cy-cdn.currents.dev npx cypress install --force + run: CYPRESS_DOWNLOAD_MIRROR=https://cy-cdn.currents.dev npx cypress install@12.17.4 --force - name: Install npm run: npm install -g npm@latest diff --git a/.github/_workflows_/e2e-monorepo.yml b/.github/workflows/e2e-monorepo.yml similarity index 97% rename from .github/_workflows_/e2e-monorepo.yml rename to .github/workflows/e2e-monorepo.yml index 98c867a8..0a9fac65 100644 --- a/.github/_workflows_/e2e-monorepo.yml +++ b/.github/workflows/e2e-monorepo.yml @@ -27,7 +27,7 @@ jobs: node-version: ${{ matrix.node-version }} - name: Install alternative cypress binaries - run: CYPRESS_DOWNLOAD_MIRROR=https://cy-cdn.currents.dev npx cypress install --force + run: CYPRESS_DOWNLOAD_MIRROR=https://cy-cdn.currents.dev npx cypress install@12.17.4 --force - name: Install dependencies run: npm ci diff --git a/.github/_workflows_/e2e-smoke-api.yml b/.github/workflows/e2e-smoke-api.yml similarity index 97% rename from .github/_workflows_/e2e-smoke-api.yml rename to .github/workflows/e2e-smoke-api.yml index 050a3458..56a5710e 100644 --- a/.github/_workflows_/e2e-smoke-api.yml +++ b/.github/workflows/e2e-smoke-api.yml @@ -23,7 +23,7 @@ jobs: node-version: "16" - name: Install alternative cypress binaries - run: CYPRESS_DOWNLOAD_MIRROR=https://cy-cdn.currents.dev npx cypress install --force + run: CYPRESS_DOWNLOAD_MIRROR=https://cy-cdn.currents.dev npx cypress install@12.17.4 --force - name: Install dependencies run: npm ci diff --git a/.github/_workflows_/e2e-smoke-component.yml b/.github/workflows/e2e-smoke-component.yml similarity index 97% rename from .github/_workflows_/e2e-smoke-component.yml rename to .github/workflows/e2e-smoke-component.yml index 0355ba47..52d98763 100644 --- a/.github/_workflows_/e2e-smoke-component.yml +++ b/.github/workflows/e2e-smoke-component.yml @@ -23,7 +23,7 @@ jobs: node-version: "16" - name: Install alternative cypress binaries - run: CYPRESS_DOWNLOAD_MIRROR=https://cy-cdn.currents.dev npx cypress install --force + run: CYPRESS_DOWNLOAD_MIRROR=https://cy-cdn.currents.dev npx cypress install@12.17.4 --force - name: Install dependencies run: npm ci diff --git a/.github/workflows/e2e-smoke-linux.yml b/.github/workflows/e2e-smoke-linux.yml index bc32eb51..18f33912 100644 --- a/.github/workflows/e2e-smoke-linux.yml +++ b/.github/workflows/e2e-smoke-linux.yml @@ -20,10 +20,10 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: "18" + node-version: "16" - name: Install alternative cypress binaries - run: CYPRESS_DOWNLOAD_MIRROR=https://cy-cdn.currents.dev npx cypress@12.17.4 install --force + run: CYPRESS_DOWNLOAD_MIRROR=https://cy-cdn.currents.dev npx cypress install@12.17.4 --force - name: Install dependencies run: npm ci diff --git a/.github/_workflows_/lint.yml b/.github/workflows/lint.yml similarity index 100% rename from .github/_workflows_/lint.yml rename to .github/workflows/lint.yml diff --git a/.github/_workflows_/unit-tests.yml b/.github/workflows/unit-tests.yml similarity index 100% rename from .github/_workflows_/unit-tests.yml rename to .github/workflows/unit-tests.yml