diff --git a/.github/workflows/e2e_debug.yml b/.github/workflows/disabled/e2e_debug.yml similarity index 98% rename from .github/workflows/e2e_debug.yml rename to .github/workflows/disabled/e2e_debug.yml index 5d0ac623b..f74ad984b 100644 --- a/.github/workflows/e2e_debug.yml +++ b/.github/workflows/disabled/e2e_debug.yml @@ -1,6 +1,9 @@ name: E2E (debug) -on: [push, pull_request] +on: + push: + pull_request: + branches: [master, dev] concurrency: group: diff --git a/.github/workflows/disabled/e2e_docker.yml b/.github/workflows/e2e_docker.yml similarity index 89% rename from .github/workflows/disabled/e2e_docker.yml rename to .github/workflows/e2e_docker.yml index b40b583d0..38b885556 100644 --- a/.github/workflows/disabled/e2e_docker.yml +++ b/.github/workflows/e2e_docker.yml @@ -13,13 +13,10 @@ concurrency: jobs: e2e: - if: - github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || - github.event_name == 'pull_request' runs-on: ubuntu-latest strategy: matrix: - resolution: ['low', 'medium', 'high'] + resolution: ['high'] steps: - name: Checkout @@ -41,7 +38,7 @@ jobs: - name: Run e2e tests (${{ matrix.resolution }} res) run: | - docker-compose -f docker-compose.ci.yml --env-file ${{ matrix.resolution }}-res.env --profile synpress --profile foundry up --build --exit-code-from synpress + docker-compose -f docker-compose.ci.yml --env-file ${{ matrix.resolution }}-res.env --profile synpress up --build --exit-code-from synpress env: COMPOSE_DOCKER_CLI_BUILD: 1 DOCKER_BUILDKIT: 1 diff --git a/package.json b/package.json index 886a46ea2..c47e1fca1 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,8 @@ "test:e2e:anvil": "start-server-and-test 'turbo start:server' http-get://localhost:3000 'CYPRESS_USE_ANVIL=true pnpm synpress:run'", "test:e2e:headless": "start-server-and-test 'turbo start:server' http-get://localhost:3000 'pnpm synpress:run --headless'", "test:e2e:headless:anvil": "start-server-and-test 'turbo start:server' http-get://localhost:3000 'CYPRESS_USE_ANVIL=true pnpm synpress:run --headless'", - "test:e2e:ci": "start-server-and-test 'VITE_LOCAL_ENV=agoric_chain pnpm start:ui' http-get://localhost:3000 'pnpm start:json-server' http-get://localhost:3004 'pnpm synpress:run --record --group'", + "test:e2e:ci": "start-server-and-test 'VITE_RUN_ENV=agoric_chain pnpm start:ui' http-get://localhost:3000 'pnpm start:json-server' http-get://localhost:3004 'pnpm synpress:run --record --group'", + "test:e2e:ci:keplr": "start-server-and-test 'VITE_RUN_ENV=agoric_chain pnpm start:ui' http-get://localhost:3000 'pnpm start:json-server' http-get://localhost:3004 'pnpm synpress:run:keplr'", "test:e2e:ci:anvil": "start-server-and-test 'turbo start:server' http-get://localhost:3000 'CYPRESS_USE_ANVIL=true pnpm synpress:run --record --group'", "test:e2e:ci:cypress-action": "CYPRESS_USE_ANVIL=true pnpm synpress:run", "synpress:run:keplr": "EXTENSION=keplr SKIP_EXTENSION_SETUP=true SYNPRESS_LOCAL_TEST=true node synpress.js run --configFile=synpress.config.js",