Skip to content

Commit e3d5673

Browse files
jacekkraMargeBot
authored and
MargeBot
committed
MAILIOS-3850 Do not refetch TestData, do not obscure submodule URL
1 parent 49691a5 commit e3d5673

File tree

2 files changed

+1
-14
lines changed

2 files changed

+1
-14
lines changed

.gitlab-ci.yml

-13
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ variables:
1313
ATLAS_DEPLOY_LIST: ""
1414
ATLAS_LINK_APP: mail
1515
ATLAS_DEPLOY_ENV: "true"
16-
TEST_DATA_URL: "https://$GIT_CI_USERNAME:$PRIVATE_TOKEN_GITLAB_API_PROTON_CI@$GITLAB_HTTPS"
1716
GIT_SUBMODULE_STRATEGY: recursive
1817

1918
# See https://confluence.protontech.ch/pages/viewpage.action?pageId=121918293
@@ -43,18 +42,6 @@ stages:
4342
- ./ProtonMail/xcodeGenHelper.sh
4443

4544
.setup_project_for_ui_tests: &setup_project_for_ui_tests
46-
# Clean up TestData folder and git module information to always fetch latest TestData state
47-
- rm -rf .git/modules/ProtonMail/ProtonMailUITests/TestData
48-
- rm -rf ProtonMail/ProtonMailUITests/TestData
49-
50-
# TEST_DATA_URL keeps the link to TestData https url
51-
- git config --global url."$TEST_DATA_URL".insteadOf "testdata-repo:"
52-
53-
# Use --force option to override previously added TestData path
54-
- git submodule add --force testdata-repo:tpe/TestData.git ProtonMail/ProtonMailUITests/TestData
55-
- git submodule init
56-
- git submodule update --init --recursive --force
57-
5845
- defaults write com.apple.iphonesimulator ConnectHardwareKeyboard 0 # Fixed UI tests failing on secure field
5946

6047
- *setup_project

.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[submodule "ProtonMail/ProtonMailUITests/TestData"]
22
path = ProtonMail/ProtonMailUITests/TestData
3-
url = testdata-repo:tpe/TestData.git
3+
url = https://gitlab.protontech.ch/tpe/TestData.git
44
[submodule "ProtonMail/ProtonMail/Resource/APP_share/DOMPurify"]
55
path = ProtonMail/ProtonMail/Resource/APP_share/DOMPurify
66
url = https://github.com/cure53/DOMPurify

0 commit comments

Comments
 (0)