Skip to content

Commit 6087f49

Browse files
Merge branch 'main' into fix/remove-segmented-tab-on-confirm-import-token-page
2 parents 9689292 + 77b7ba4 commit 6087f49

File tree

160 files changed

+7818
-13803
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

160 files changed

+7818
-13803
lines changed

.circleci/config.yml

+1-266
Original file line numberDiff line numberDiff line change
@@ -83,18 +83,6 @@ aliases:
8383
cat ${HOME}/project/.circleci/scripts/enable-vnc.sh >> ~/.bashrc
8484
fi
8585
86-
# Check if MMI tests should run
87-
- &check-mmi-trigger
88-
name: Check if MMI tests should run
89-
command: |
90-
source mmi_trigger.env
91-
if [ "${run_mmi_tests}" == "true" ]; then
92-
echo "Running MMI tests"
93-
else
94-
echo "Skipping MMI tests"
95-
circleci step halt
96-
fi
97-
9886
workflows:
9987
test_and_release:
10088
when:
@@ -114,7 +102,6 @@ workflows:
114102
- trigger-beta-build:
115103
requires:
116104
- prep-deps
117-
- check-mmi-trigger
118105
- prep-deps
119106
- get-changed-files-with-git-diff:
120107
filters:
@@ -123,9 +110,6 @@ workflows:
123110
- master
124111
requires:
125112
- prep-deps
126-
- prep-build-mmi:
127-
requires:
128-
- prep-deps
129113
- prep-build:
130114
requires:
131115
- prep-deps
@@ -153,14 +137,6 @@ workflows:
153137
- prep-build-test-flask-mv2:
154138
requires:
155139
- prep-deps
156-
- prep-build-test-mmi:
157-
requires:
158-
- prep-deps
159-
- check-mmi-trigger
160-
- prep-build-test-mmi-playwright:
161-
requires:
162-
- prep-deps
163-
- check-mmi-trigger
164140
- prep-build-storybook:
165141
requires:
166142
- prep-deps
@@ -201,20 +177,9 @@ workflows:
201177
<<: *main_master_rc_only
202178
requires:
203179
- prep-build-test-flask-mv2
204-
- test-e2e-chrome-mmi:
205-
requires:
206-
- prep-build-test-mmi
207-
- get-changed-files-with-git-diff
208-
- test-e2e-mmi-playwright:
209-
requires:
210-
- prep-build-test-mmi-playwright
211180
- test-e2e-swap-playwright - OPTIONAL:
212181
requires:
213182
- prep-build
214-
- test-e2e-chrome-rpc-mmi:
215-
requires:
216-
- prep-build-test-mmi
217-
- get-changed-files-with-git-diff
218183
- test-e2e-chrome-vault-decryption:
219184
filters:
220185
branches:
@@ -236,9 +201,6 @@ workflows:
236201
- validate-source-maps-beta:
237202
requires:
238203
- trigger-beta-build
239-
- validate-source-maps-mmi:
240-
requires:
241-
- prep-build-mmi
242204
- validate-source-maps-flask:
243205
requires:
244206
- prep-build-flask
@@ -258,16 +220,13 @@ workflows:
258220
- validate-source-maps
259221
- validate-source-maps-beta
260222
- validate-source-maps-flask
261-
- validate-source-maps-mmi
262223
- test-mozilla-lint-mv2
263224
- test-mozilla-lint-flask-mv2
264225
- test-e2e-chrome
265226
- test-e2e-chrome-multiple-providers
266227
- test-e2e-firefox
267228
- test-e2e-chrome-flask
268229
- test-e2e-firefox-flask
269-
- test-e2e-chrome-mmi
270-
- test-e2e-chrome-rpc-mmi
271230
- test-e2e-chrome-vault-decryption
272231
- test-e2e-chrome-webpack
273232
- test-storybook
@@ -285,7 +244,6 @@ workflows:
285244
- prep-deps
286245
- prep-build
287246
- prep-build-mv2
288-
- prep-build-mmi
289247
- prep-build-flask
290248
- prep-build-flask-mv2
291249
- prep-build-test
@@ -307,7 +265,6 @@ workflows:
307265
- prep-deps
308266
- prep-build
309267
- prep-build-mv2
310-
- prep-build-mmi
311268
- prep-build-flask
312269
- prep-build-flask-mv2
313270
- all-tests-pass
@@ -549,50 +506,6 @@ jobs:
549506
- dist-mv2
550507
- builds-mv2
551508

552-
prep-build-mmi:
553-
executor: node-linux-medium
554-
steps:
555-
- run: *shallow-git-clone-and-enable-vnc
556-
- run: corepack enable
557-
- attach_workspace:
558-
at: .
559-
- when:
560-
condition:
561-
not:
562-
matches:
563-
pattern: /^master$/
564-
value: << pipeline.git.branch >>
565-
steps:
566-
- run:
567-
name: build:dist
568-
command: yarn build --build-type mmi dist
569-
- when:
570-
condition:
571-
matches:
572-
pattern: /^master$/
573-
value: << pipeline.git.branch >>
574-
steps:
575-
- run:
576-
name: build:prod
577-
command: yarn build --build-type mmi prod
578-
- run:
579-
name: build:debug
580-
command: find dist/ -type f -exec md5sum {} \; | sort -k 2
581-
- run:
582-
name: Move mmi build to 'dist-mmi' to avoid conflict with production build
583-
command: mv ./dist ./dist-mmi
584-
- run:
585-
name: Move mmi zips to 'builds-mmi' to avoid conflict with production build
586-
command: mv ./builds ./builds-mmi
587-
- persist_to_workspace:
588-
root: .
589-
paths:
590-
- dist-mmi
591-
- builds-mmi
592-
- store_artifacts:
593-
path: builds-mmi
594-
destination: builds-mmi
595-
596509
prep-build-flask:
597510
executor: node-linux-medium
598511
steps:
@@ -719,57 +632,6 @@ jobs:
719632
- dist-test-flask-mv2
720633
- builds-test-flask-mv2
721634

722-
prep-build-test-mmi:
723-
executor: node-linux-medium
724-
steps:
725-
- run: *shallow-git-clone-and-enable-vnc
726-
- run: corepack enable
727-
- attach_workspace:
728-
at: .
729-
- run: *check-mmi-trigger
730-
- run:
731-
name: Build extension for testing
732-
command: yarn build:test:mmi
733-
- run:
734-
name: Move test build to 'dist-test' to avoid conflict with production build
735-
command: mv ./dist ./dist-test-mmi
736-
- run:
737-
name: Move test zips to 'builds-test' to avoid conflict with production build
738-
command: mv ./builds ./builds-test-mmi
739-
- persist_to_workspace:
740-
root: .
741-
paths:
742-
- dist-test-mmi
743-
- builds-test-mmi
744-
745-
prep-build-test-mmi-playwright:
746-
executor: node-linux-medium
747-
steps:
748-
- run: *shallow-git-clone-and-enable-vnc
749-
- run: corepack enable
750-
- attach_workspace:
751-
at: .
752-
- run: *check-mmi-trigger
753-
- run:
754-
name: Build MMI extension for Playwright e2e
755-
command: |
756-
export MMI_CONFIGURATION_SERVICE_URL=$MMI_DEV_CONFIGURATION_SERVICE_URL
757-
yarn dist:mmi
758-
- run:
759-
name: Move test build to 'dist-test' to avoid conflict with production build
760-
command: mv ./dist ./dist-test-mmi-playwright
761-
- run:
762-
name: Move test zips to 'builds-test' to avoid conflict with production build
763-
command: mv ./builds ./builds-test-mmi-playwright
764-
- persist_to_workspace:
765-
root: .
766-
paths:
767-
- dist-test-mmi-playwright
768-
- builds-test-mmi-playwright
769-
- store_artifacts:
770-
path: builds-test-mmi-playwright
771-
destination: builds-test-mmi-playwright
772-
773635
prep-build-test:
774636
executor: node-linux-medium
775637
steps:
@@ -1017,30 +879,6 @@ jobs:
1017879
- store_test_results:
1018880
path: test/test-results/e2e
1019881

1020-
test-e2e-chrome-rpc-mmi:
1021-
executor: node-browsers-medium
1022-
steps:
1023-
- run: *shallow-git-clone-and-enable-vnc
1024-
- run: sudo corepack enable
1025-
- attach_workspace:
1026-
at: .
1027-
- run: *check-mmi-trigger
1028-
- run:
1029-
name: Move test build to dist
1030-
command: mv ./dist-test-mmi ./dist
1031-
- run:
1032-
name: Move test zips to builds
1033-
command: mv ./builds-test-mmi ./builds
1034-
- run:
1035-
name: test:e2e:chrome:rpc
1036-
command: .circleci/scripts/test-run-e2e.sh yarn test:e2e:chrome:rpc --build-type=mmi
1037-
no_output_timeout: 5m
1038-
- store_artifacts:
1039-
path: test-artifacts
1040-
destination: test-artifacts
1041-
- store_test_results:
1042-
path: test/test-results/e2e
1043-
1044882
test-e2e-chrome-vault-decryption:
1045883
executor: node-browsers-medium-plus
1046884
steps:
@@ -1106,72 +944,6 @@ jobs:
1106944
- store_test_results:
1107945
path: test/test-results/e2e
1108946

1109-
test-e2e-chrome-mmi:
1110-
executor: node-browsers-medium-plus
1111-
parallelism: 12
1112-
steps:
1113-
- run: *shallow-git-clone-and-enable-vnc
1114-
- run: sudo corepack enable
1115-
- attach_workspace:
1116-
at: .
1117-
- run: *check-mmi-trigger
1118-
- run:
1119-
name: Move test build to dist
1120-
command: mv ./dist-test-mmi ./dist
1121-
- run:
1122-
name: Move test zips to builds
1123-
command: mv ./builds-test-mmi ./builds
1124-
- run:
1125-
name: test:e2e:chrome:mmi
1126-
command: .circleci/scripts/test-run-e2e.sh yarn test:e2e:chrome:mmi --build-type=mmi
1127-
no_output_timeout: 5m
1128-
- store_artifacts:
1129-
path: test-artifacts
1130-
destination: test-artifacts
1131-
- store_test_results:
1132-
path: test/test-results/e2e
1133-
1134-
test-e2e-mmi-playwright:
1135-
executor: playwright
1136-
parallelism: 2
1137-
steps:
1138-
- run: *shallow-git-clone-and-enable-vnc
1139-
- run: corepack enable
1140-
- attach_workspace:
1141-
at: .
1142-
- run: *check-mmi-trigger
1143-
- run:
1144-
name: Move test build to dist
1145-
command: mv ./dist-test-mmi-playwright ./dist
1146-
- run:
1147-
name: Install chromium
1148-
command: yarn playwright install chromium
1149-
- run:
1150-
name: test:e2e:chrome:mmi
1151-
command: |
1152-
TESTFILES=$(circleci tests glob "test/e2e/playwright/mmi/**/*.spec.ts")
1153-
echo "$TESTFILES"
1154-
echo "$TESTFILES" | timeout 20m circleci tests run --command="xvfb-run xargs yarn playwright test --project=mmi" verbose --split-by=timings
1155-
no_output_timeout: 10m
1156-
- slack/notify:
1157-
branch_pattern: Version-v*
1158-
event: fail
1159-
mentions: <@antonio.regadas>, @ramon.acitores134
1160-
template: basic_fail_1
1161-
channel: C01LUJL3T98
1162-
- slack/notify:
1163-
branch_pattern: main
1164-
event: fail
1165-
mentions: <@antonio.regadas>, @ramon.acitores134
1166-
template: basic_fail_1
1167-
channel: C05QXJA7NP8
1168-
- store_artifacts:
1169-
name: html-report and artifacts
1170-
path: public/playwright/playwright-reports
1171-
- store_test_results:
1172-
name: report for pipeline integration
1173-
path: public/playwright/playwright-reports/junit/test-results.xml
1174-
1175947
test-e2e-swap-playwright - OPTIONAL:
1176948
executor: playwright
1177949
parallelism: 2
@@ -1335,9 +1107,7 @@ jobs:
13351107
- store_artifacts:
13361108
path: builds-flask-mv2
13371109
destination: builds-flask-mv2
1338-
- store_artifacts:
1339-
path: builds-mmi
1340-
destination: builds-mmi
1110+
13411111
- store_artifacts:
13421112
path: builds-mv2
13431113
destination: builds-mv2
@@ -1385,9 +1155,6 @@ jobs:
13851155
- run:
13861156
name: Publish Flask MV2 release to Sentry
13871157
command: yarn sentry:publish --build-type flask --dist mv2
1388-
- run:
1389-
name: Publish MMI release to Sentry
1390-
command: yarn sentry:publish --build-type mmi
13911158
- run:
13921159
name: Create GitHub release
13931160
command: .circleci/scripts/release-create-gh-release.sh
@@ -1448,23 +1215,6 @@ jobs:
14481215
name: Validate source maps
14491216
command: .circleci/scripts/validate-source-maps-beta.sh
14501217

1451-
validate-source-maps-mmi:
1452-
executor: node-browsers-small
1453-
steps:
1454-
- run: *shallow-git-clone-and-enable-vnc
1455-
- run: sudo corepack enable
1456-
- attach_workspace:
1457-
at: .
1458-
- run:
1459-
name: Move mmi build to dist
1460-
command: mv ./dist-mmi ./dist
1461-
- run:
1462-
name: Move mmi zips to builds
1463-
command: mv ./builds-mmi ./builds
1464-
- run:
1465-
name: Validate source maps
1466-
command: yarn validate-source-maps
1467-
14681218
validate-source-maps-flask:
14691219
executor: node-browsers-small
14701220
steps:
@@ -1556,18 +1306,3 @@ jobs:
15561306
- run:
15571307
name: All Tests Passed
15581308
command: echo 'whew - everything passed!'
1559-
1560-
check-mmi-trigger:
1561-
executor: node-browsers-small
1562-
steps:
1563-
- checkout
1564-
- run:
1565-
name: Check for MMI Team Label or Reviewer
1566-
command: ./.circleci/scripts/check_mmi_trigger.sh
1567-
- store_artifacts:
1568-
path: mmi_trigger.env
1569-
destination: mmi_trigger.env
1570-
- persist_to_workspace:
1571-
root: .
1572-
paths:
1573-
- mmi_trigger.env

0 commit comments

Comments
 (0)