Skip to content

Commit 60c3c22

Browse files
committed
chore: sets prefix to sub-workflows to clarify their difference
1 parent f88b5a8 commit 60c3c22

11 files changed

+21
-26
lines changed

.github/workflows/app-eps_develop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,6 @@ jobs:
5656
container_scan:
5757
name: Container Scan
5858
needs: build_and_push
59-
uses: iris-connect/iris-client/.github/workflows/trivy-container-scan.yml@develop
59+
uses: iris-connect/iris-client/.github/workflows/sub.trivy-container-scan.yml@develop
6060
with:
6161
image-refs: "[ '${{needs.build_and_push.outputs.image-ref}}' ]"

.github/workflows/client_develop.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
skip_after_successful_duplicate: 'false'
2828
cancel_others: 'true'
2929
paths_ignore: '["**/README.md", "**/Readme.md", "**/docs/**", "**/postman/**"]'
30-
paths: '[".github/workflows/bff_develop.yml", "iris-client-bff/**"]'
30+
paths: '[".github/workflows/sub.bff_develop.yml", "iris-client-bff/**"]'
3131

3232
- id: skip_check_fe
3333
name: Skip Check FE
@@ -36,7 +36,7 @@ jobs:
3636
skip_after_successful_duplicate: 'false'
3737
cancel_others: 'true'
3838
paths_ignore: '["**/README.md", "**/Readme.md", "**/docs/**", "**/postman/**"]'
39-
paths: '[".github/workflows/fe_develop.yml", "iris-client-fe/**"]'
39+
paths: '[".github/workflows/sub.fe_develop.yml", "iris-client-fe/**"]'
4040

4141
determine_images:
4242
name: Determines Relevant Images
@@ -80,7 +80,7 @@ jobs:
8080
name: Build BFF
8181
needs: [skip_check, determine_tag]
8282
if: ${{ needs.skip_check.outputs.should_skip_bff != 'true' }}
83-
uses: iris-connect/iris-client/.github/workflows/bff_develop.yml@chore/optimized_build
83+
uses: iris-connect/iris-client/.github/workflows/sub.bff_develop.yml@chore/optimized_build
8484
with:
8585
image_tag: ${{needs.determine_tag.outputs.image_tag}}
8686
secrets:
@@ -92,13 +92,13 @@ jobs:
9292
needs: bff
9393
# the previous job might be skipped, we don't need to run this job then
9494
if: success() || failure()
95-
uses: iris-connect/iris-client/.github/workflows/publish-test-results.yml@chore/optimized_build
95+
uses: iris-connect/iris-client/.github/workflows/sub.publish-test-results.yml@chore/optimized_build
9696

9797
fe:
9898
name: Build FE
9999
needs: [skip_check, determine_tag]
100100
if: ${{ needs.skip_check.outputs.should_skip_fe != 'true' }}
101-
uses: iris-connect/iris-client/.github/workflows/fe_develop.yml@chore/optimized_build
101+
uses: iris-connect/iris-client/.github/workflows/sub.fe_develop.yml@chore/optimized_build
102102
with:
103103
image_tag: ${{needs.determine_tag.outputs.image_tag}}
104104
secrets:
@@ -109,12 +109,15 @@ jobs:
109109
name: Run E2E Tests
110110
needs: [bff, fe]
111111
if: ${{ !failure() && !cancelled() && (success('bff') || success('fe')) }}
112-
uses: iris-connect/iris-client/.github/workflows/fe-e2e-test.yml@chore/optimized_build
112+
# if: ${{ always() && contains(needs.*.result, 'success') && !(contains(needs.*.result, 'failure')) }}
113+
# from: https://github.community/t/run-a-job-if-at-least-one-of-the-previous-ones-succeeded/163777/2
114+
# Does not work! See also for the solution above: https://github.com/actions/runner/issues/491
115+
uses: iris-connect/iris-client/.github/workflows/sub.fe-e2e-test.yml@chore/optimized_build
113116

114117
container_scan:
115118
name: Container Scan
116119
needs: [determine_tag, bff, fe]
117120
if: ${{ !failure() && !cancelled() }}
118-
uses: iris-connect/iris-client/.github/workflows/trivy-container-scan.yml@chore/optimized_build
121+
uses: iris-connect/iris-client/.github/workflows/sub.trivy-container-scan.yml@chore/optimized_build
119122
with:
120123
image-refs: ${{ toJSON(fromJSON(needs.determine_tag.outputs.image_json).tags) }}

.github/workflows/iris-client-eps_develop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,6 @@ jobs:
5656
container_scan:
5757
name: Container Scan
5858
needs: build_and_push
59-
uses: iris-connect/iris-client/.github/workflows/trivy-container-scan.yml@develop
59+
uses: iris-connect/iris-client/.github/workflows/sub.trivy-container-scan.yml@develop
6060
with:
6161
image-refs: "[ '${{needs.build_and_push.outputs.image-ref}}' ]"

.github/workflows/iris-client-proxy_develop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,6 @@ jobs:
5656
container_scan:
5757
name: Container Scan
5858
needs: build_and_push
59-
uses: iris-connect/iris-client/.github/workflows/trivy-container-scan.yml@develop
59+
uses: iris-connect/iris-client/.github/workflows/sub.trivy-container-scan.yml@develop
6060
with:
6161
image-refs: "[ '${{needs.build_and_push.outputs.image-ref}}' ]"

.github/workflows/nginx_develop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,6 @@ jobs:
5757
container_scan:
5858
name: Container Scan
5959
needs: build_and_push
60-
uses: iris-connect/iris-client/.github/workflows/trivy-container-scan.yml@develop
60+
uses: iris-connect/iris-client/.github/workflows/sub.trivy-container-scan.yml@develop
6161
with:
6262
image-refs: "[ '${{needs.build_and_push.outputs.image-ref}}' ]"

.github/workflows/release-gitflow.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ on:
1010
- next
1111
- next-major
1212
- 1.**
13-
14-
defaults:
15-
run:
16-
shell: bash
1713

1814
jobs:
1915
release-client:
@@ -82,11 +78,16 @@ jobs:
8278
publish-test-results:
8379
name: Publish Test Results
8480
needs: release-client
85-
uses: iris-connect/iris-client/.github/workflows/publish-test-results.yml@develop
81+
uses: iris-connect/iris-client/.github/workflows/sub.publish-test-results.yml@develop
82+
83+
e2e_test:
84+
name: Run E2E Tests
85+
needs: release-client
86+
uses: iris-connect/iris-client/.github/workflows/sub.fe-e2e-test.yml@chore/optimized_build
8687

8788
container_scan:
8889
name: Container Scan
8990
needs: release-client
90-
uses: iris-connect/iris-client/.github/workflows/trivy-container-scan.yml@develop
91+
uses: iris-connect/iris-client/.github/workflows/sub.trivy-container-scan.yml@develop
9192
with:
9293
image-refs: "[ 'inoeg/iris-client-bff:latest', 'inoeg/iris-client-frontend:latest', 'inoeg/iris-client-nginx:latest', 'inoeg/iris-client-eps:latest', 'inoeg/iris-client-proxy:latest', 'inoeg/app-eps:latest']"

.github/workflows/bff_develop.yml renamed to .github/workflows/sub.bff_develop.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@ on:
1616
DOCKER_HUB_PW:
1717
required: true
1818

19-
defaults:
20-
run:
21-
shell: bash
22-
2319
jobs:
2420
build_and_push:
2521
name: Build and push to docker.io

.github/workflows/fe-e2e-test.yml renamed to .github/workflows/sub.fe-e2e-test.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
name: FE e2e Test
22

33
on:
4-
push:
5-
branches:
6-
- main
7-
- release
8-
- 1.**
94
workflow_call:
105

116
jobs:
File renamed without changes.

0 commit comments

Comments
 (0)