Skip to content

Commit 77c3bc4

Browse files
steffenkleinlesteffenkleinle
authored
Merge pull request #3165 from digitalfabrik/3076-restructure-workflows
3076: Add promotion and remove unused workflows
2 parents 7d3a9fc + 0689836 commit 77c3bc4

File tree

9 files changed

+68
-271
lines changed

9 files changed

+68
-271
lines changed

‎.circleci/config.yml

+36-132
Original file line numberDiff line numberDiff line change
@@ -989,33 +989,6 @@ jobs:
989989
command: tools/sentry-release web-obdach "${NEW_VERSION_NAME}" ~/attached_workspace/dist/obdach
990990
name: 'Sentry Upload: obdach'
991991
- notify
992-
upload_browserstack:
993-
docker:
994-
- image: cimg/ruby:3.2.5
995-
environment:
996-
FASTLANE_SKIP_UPDATE_CHECK: true
997-
parameters:
998-
file_name:
999-
description: the name of the file to upload
1000-
type: string
1001-
resource_class: small
1002-
shell: /bin/bash -eo pipefail
1003-
steps:
1004-
- checkout
1005-
- skip_job
1006-
- prepare_workspace
1007-
- restore_environment_variables
1008-
- restore_ruby_cache:
1009-
directory: native
1010-
- run:
1011-
command: |
1012-
file="attached_workspace/<< parameters.file_name >>"
1013-
file_with_commit_sha="${file%.*}_<< pipeline.git.revision >>.${file##*.}"
1014-
cp ~/$file ~/$file_with_commit_sha
1015-
bundle exec fastlane browserstack_upload path:$file_with_commit_sha
1016-
name: '[FL] Browserstack Upload Live'
1017-
working_directory: native
1018-
- notify
1019992
parameters:
1020993
api_triggered:
1021994
default: false
@@ -1024,25 +997,20 @@ parameters:
1024997
workflow_type:
1025998
default: none
1026999
enum:
1000+
- delivery
1001+
- promotion
10271002
- native_beta_delivery
10281003
- native_production_delivery
10291004
- native_promotion
10301005
- web_beta_delivery
10311006
- web_production_delivery
10321007
- web_promotion
1033-
- delivery
1034-
- e2e_tests
1035-
- native_browserstack
10361008
- none
10371009
type: enum
10381010
version: 2.1
10391011
workflows:
10401012
commit:
10411013
jobs:
1042-
- bump_version:
1043-
context:
1044-
- mattermost
1045-
prepare_delivery: false
10461014
- check:
10471015
context:
10481016
- mattermost
@@ -1242,58 +1210,6 @@ workflows:
12421210
- equal:
12431211
- << pipeline.parameters.workflow_type >>
12441212
- delivery
1245-
e2e_tests:
1246-
jobs:
1247-
- bump_version:
1248-
context:
1249-
- mattermost
1250-
prepare_delivery: false
1251-
- build_web:
1252-
build_config_name: integreat-test-cms
1253-
context:
1254-
- mattermost
1255-
name: build_ig_test_cms_web
1256-
requires:
1257-
- bump_version
1258-
- e2e_web:
1259-
context:
1260-
- mattermost
1261-
- build_android:
1262-
build_config_name: integreat-e2e
1263-
context:
1264-
- credentials-repo
1265-
- credentials-integreat
1266-
- mattermost
1267-
name: build_e2e_android
1268-
requires:
1269-
- bump_version
1270-
- e2e_android:
1271-
context:
1272-
- browserstack
1273-
- mattermost
1274-
requires:
1275-
- build_e2e_android
1276-
- build_ios:
1277-
build_config_name: integreat-e2e
1278-
context:
1279-
- tuerantuer-apple
1280-
- fastlane-match
1281-
- mattermost
1282-
name: build_e2e_ios
1283-
requires:
1284-
- bump_version
1285-
- e2e_ios:
1286-
context:
1287-
- browserstack
1288-
- mattermost
1289-
requires:
1290-
- build_e2e_ios
1291-
when:
1292-
and:
1293-
- << pipeline.parameters.api_triggered >>
1294-
- equal:
1295-
- << pipeline.parameters.workflow_type >>
1296-
- e2e_tests
12971213
native_beta_delivery:
12981214
jobs:
12991215
- bump_version:
@@ -1408,52 +1324,6 @@ workflows:
14081324
- equal:
14091325
- << pipeline.parameters.workflow_type >>
14101326
- native_beta_delivery
1411-
native_browserstack:
1412-
jobs:
1413-
- bump_version:
1414-
context:
1415-
- mattermost
1416-
prepare_delivery: false
1417-
- build_android:
1418-
build_config_name: integreat-test-cms
1419-
context:
1420-
- mattermost
1421-
- credentials-repo
1422-
- credentials-integreat
1423-
name: build_ig_test_cms_android
1424-
requires:
1425-
- bump_version
1426-
- upload_browserstack:
1427-
context:
1428-
- mattermost
1429-
- browserstack
1430-
file_name: integreat-test-cms.apk
1431-
name: upload_ig_test_cms_android_browserstack
1432-
requires:
1433-
- build_ig_test_cms_android
1434-
- build_ios:
1435-
build_config_name: integreat-test-cms
1436-
context:
1437-
- mattermost
1438-
- tuerantuer-apple
1439-
- fastlane-match
1440-
name: build_ig_test_cms_ios
1441-
requires:
1442-
- bump_version
1443-
- upload_browserstack:
1444-
context:
1445-
- mattermost
1446-
- browserstack
1447-
file_name: integreat-test-cms.ipa
1448-
name: upload_ig_test_cms_ios_browserstack
1449-
requires:
1450-
- build_ig_test_cms_ios
1451-
when:
1452-
and:
1453-
- << pipeline.parameters.api_triggered >>
1454-
- equal:
1455-
- << pipeline.parameters.workflow_type >>
1456-
- native_browserstack
14571327
native_production_delivery:
14581328
jobs:
14591329
- bump_version:
@@ -1598,6 +1468,40 @@ workflows:
15981468
- equal:
15991469
- << pipeline.parameters.workflow_type >>
16001470
- native_promotion
1471+
promotion:
1472+
jobs:
1473+
- promote_web:
1474+
context:
1475+
- mattermost
1476+
- deliverino
1477+
- promote_android:
1478+
context:
1479+
- mattermost
1480+
- tuerantuer-google-play
1481+
- deliverino
1482+
matrix:
1483+
parameters:
1484+
build_config_name:
1485+
- integreat
1486+
- malte
1487+
- aschaffenburg
1488+
- promote_ios:
1489+
context:
1490+
- mattermost
1491+
- tuerantuer-apple
1492+
- deliverino
1493+
matrix:
1494+
parameters:
1495+
build_config_name:
1496+
- integreat
1497+
- malte
1498+
- aschaffenburg
1499+
when:
1500+
and:
1501+
- << pipeline.parameters.api_triggered >>
1502+
- equal:
1503+
- << pipeline.parameters.workflow_type >>
1504+
- promotion
16011505
web_beta_delivery:
16021506
jobs:
16031507
- bump_version:

‎.circleci/src/@common.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,14 @@ parameters:
99
type: enum
1010
enum:
1111
[
12+
delivery,
13+
promotion,
1214
native_beta_delivery,
1315
native_production_delivery,
1416
native_promotion,
1517
web_beta_delivery,
1618
web_production_delivery,
1719
web_promotion,
18-
delivery,
19-
e2e_tests,
20-
native_browserstack,
2120
none,
2221
]
2322
default: none

‎.circleci/src/jobs/upload_browserstack.yml

-26
This file was deleted.

‎.circleci/src/workflows/commit.yml

-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ unless:
33
- equal: [main, << pipeline.git.branch >>]
44
- << pipeline.parameters.api_triggered >>
55
jobs:
6-
- bump_version:
7-
prepare_delivery: false
8-
context:
9-
- mattermost
10-
116
- check:
127
context:
138
- mattermost

‎.circleci/src/workflows/e2e_tests.yml

-51
This file was deleted.

‎.circleci/src/workflows/native_browserstack.yml

-45
This file was deleted.

‎.circleci/src/workflows/promotion.yml

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
when:
2+
and:
3+
- << pipeline.parameters.api_triggered >>
4+
- equal: [<< pipeline.parameters.workflow_type >>, promotion]
5+
jobs:
6+
- promote_web:
7+
context:
8+
- mattermost
9+
- deliverino
10+
- promote_android:
11+
matrix:
12+
parameters:
13+
build_config_name: [integreat, malte, aschaffenburg]
14+
context:
15+
- mattermost
16+
- tuerantuer-google-play
17+
- deliverino
18+
- promote_ios:
19+
matrix:
20+
parameters:
21+
build_config_name: [integreat, malte, aschaffenburg]
22+
context:
23+
- mattermost
24+
- tuerantuer-apple
25+
- deliverino

0 commit comments

Comments
 (0)