Skip to content

Commit

Permalink
chore(ci): adjust connect-explorer-webextension
Browse files Browse the repository at this point in the history
  • Loading branch information
karliatto authored and mroz22 committed Feb 22, 2024
1 parent 69c4311 commit 444b665
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
2 changes: 0 additions & 2 deletions ci/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,6 @@ suite-desktop build windows codesign:
- ./packages/connect-web/scripts/check-inline-build-size.sh
- yarn workspace @trezor/connect-iframe build
- yarn workspace @trezor/connect-popup build
- yarn workspace @trezor/connect-explorer-webextension build
# build webextension examples with latest trezor.io and latest npm package
- node ./packages/connect-examples/update-webextensions.js --trezor-connect-src "https://suite.corp.sldev.cz/connect/${CI_COMMIT_REF_NAME}/"
# build webextension examples with latest trezor.io and outdated npm package (current production)
Expand All @@ -268,7 +267,6 @@ suite-desktop build windows codesign:
- packages/connect-examples/webextension-mv3/build
- packages/connect-examples/webextension-mv3/build-legacy
- packages/connect-examples/webextension-mv3-sw/build
- packages/connect-explorer-webextension/build
- packages/connect-explorer/build-webextension

connect-explorer build:
Expand Down
24 changes: 13 additions & 11 deletions ci/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ transport manual:
# @trezor/connect-popup (via @trezor/connect-explorer)
.e2e connect-popup:
stage: integration testing
retry: 1
retry: 0
variables:
COMPOSE_PROJECT_NAME: $CI_JOB_ID
COMPOSE_FILE: ./docker/docker-compose.connect-popup-ci.yml
Expand Down Expand Up @@ -308,19 +308,21 @@ connect-popup legacy npm package:
refs:
- schedules

.e2e connect-popup-webextension:
.e2e connect-explorer-webextension:
stage: integration testing
retry: 1
retry: 0
variables:
COMPOSE_PROJECT_NAME: $CI_JOB_ID
COMPOSE_FILE: ./docker/docker-compose.connect-popup-ci.yml
TREZOR_CONNECT_SRC: ${DEV_SERVER_URL}/connect/${CI_COMMIT_REF_NAME}/
URL: ${DEV_SERVER_URL}/connect/${CI_COMMIT_REF_NAME}/
__TREZOR_CONNECT_SRC: ${DEV_SERVER_URL}/connect/${CI_COMMIT_REF_NAME}/
TEST_FILE: $TEST_FILE
IS_WEBEXTENSION: "true"
script:
- yarn install --immutable
- yarn workspace @trezor/connect-explorer-webextension build
- yarn build:libs
- yarn workspace @trezor/connect-webextension build
- yarn workspace @trezor/connect-iframe build:core-module
- yarn workspace @trezor/connect-explorer build:webextension
- docker-compose pull
- docker-compose up -d trezor-user-env-unix
- docker-compose run test-run
Expand All @@ -342,16 +344,16 @@ connect-popup legacy npm package:
- TEST_FILE: ["popup-close.test"]
- TEST_FILE: ["popup-error-page.test"]

connect-popup-webextension:
extends: .e2e connect-popup-webextension
connect-explorer-webextension:
extends: .e2e connect-explorer-webextension
dependencies:
- install
- connect-web build
only:
<<: *run_everything_rules

connect-popup-webextension manual:
extends: .e2e connect-popup-webextension
connect-explorer-webextension manual:
extends: .e2e connect-explorer-webextension
needs:
- install
- connect-web build
Expand All @@ -361,7 +363,7 @@ connect-popup-webextension manual:

.connect:
stage: integration testing
retry: 1
retry: 0
dependencies:
- install
variables:
Expand Down

0 comments on commit 444b665

Please sign in to comment.