Skip to content

Commit

Permalink
chore: moves sub-workflows to a sub-folder
Browse files Browse the repository at this point in the history
  • Loading branch information
jekutzsche committed Nov 20, 2021
1 parent f88b5a8 commit d00c63a
Show file tree
Hide file tree
Showing 11 changed files with 16 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/app-eps_develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,6 @@ jobs:
container_scan:
name: Container Scan
needs: build_and_push
uses: iris-connect/iris-client/.github/workflows/trivy-container-scan.yml@develop
uses: iris-connect/iris-client/.github/workflows/subs/trivy-container-scan.yml@develop
with:
image-refs: "[ '${{needs.build_and_push.outputs.image-ref}}' ]"
17 changes: 10 additions & 7 deletions .github/workflows/client_develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
skip_after_successful_duplicate: 'false'
cancel_others: 'true'
paths_ignore: '["**/README.md", "**/Readme.md", "**/docs/**", "**/postman/**"]'
paths: '[".github/workflows/bff_develop.yml", "iris-client-bff/**"]'
paths: '[".github/workflows/subs/bff_develop.yml", "iris-client-bff/**"]'

- id: skip_check_fe
name: Skip Check FE
Expand All @@ -36,7 +36,7 @@ jobs:
skip_after_successful_duplicate: 'false'
cancel_others: 'true'
paths_ignore: '["**/README.md", "**/Readme.md", "**/docs/**", "**/postman/**"]'
paths: '[".github/workflows/fe_develop.yml", "iris-client-fe/**"]'
paths: '[".github/workflows/subs/fe_develop.yml", "iris-client-fe/**"]'

determine_images:
name: Determines Relevant Images
Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:
name: Build BFF
needs: [skip_check, determine_tag]
if: ${{ needs.skip_check.outputs.should_skip_bff != 'true' }}
uses: iris-connect/iris-client/.github/workflows/bff_develop.yml@chore/optimized_build
uses: iris-connect/iris-client/.github/workflows/subs/bff_develop.yml@chore/optimized_build
with:
image_tag: ${{needs.determine_tag.outputs.image_tag}}
secrets:
Expand All @@ -92,13 +92,13 @@ jobs:
needs: bff
# the previous job might be skipped, we don't need to run this job then
if: success() || failure()
uses: iris-connect/iris-client/.github/workflows/publish-test-results.yml@chore/optimized_build
uses: iris-connect/iris-client/.github/workflows/subs/publish-test-results.yml@chore/optimized_build

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

container_scan:
name: Container Scan
needs: [determine_tag, bff, fe]
if: ${{ !failure() && !cancelled() }}
uses: iris-connect/iris-client/.github/workflows/trivy-container-scan.yml@chore/optimized_build
uses: iris-connect/iris-client/.github/workflows/subs/trivy-container-scan.yml@chore/optimized_build
with:
image-refs: ${{ toJSON(fromJSON(needs.determine_tag.outputs.image_json).tags) }}
2 changes: 1 addition & 1 deletion .github/workflows/iris-client-eps_develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,6 @@ jobs:
container_scan:
name: Container Scan
needs: build_and_push
uses: iris-connect/iris-client/.github/workflows/trivy-container-scan.yml@develop
uses: iris-connect/iris-client/.github/workflows/subs/trivy-container-scan.yml@develop
with:
image-refs: "[ '${{needs.build_and_push.outputs.image-ref}}' ]"
2 changes: 1 addition & 1 deletion .github/workflows/iris-client-proxy_develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,6 @@ jobs:
container_scan:
name: Container Scan
needs: build_and_push
uses: iris-connect/iris-client/.github/workflows/trivy-container-scan.yml@develop
uses: iris-connect/iris-client/.github/workflows/subs/trivy-container-scan.yml@develop
with:
image-refs: "[ '${{needs.build_and_push.outputs.image-ref}}' ]"
2 changes: 1 addition & 1 deletion .github/workflows/nginx_develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,6 @@ jobs:
container_scan:
name: Container Scan
needs: build_and_push
uses: iris-connect/iris-client/.github/workflows/trivy-container-scan.yml@develop
uses: iris-connect/iris-client/.github/workflows/subs/trivy-container-scan.yml@develop
with:
image-refs: "[ '${{needs.build_and_push.outputs.image-ref}}' ]"
4 changes: 2 additions & 2 deletions .github/workflows/release-gitflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,11 @@ jobs:
publish-test-results:
name: Publish Test Results
needs: release-client
uses: iris-connect/iris-client/.github/workflows/publish-test-results.yml@develop
uses: iris-connect/iris-client/.github/workflows/subs/publish-test-results.yml@develop

container_scan:
name: Container Scan
needs: release-client
uses: iris-connect/iris-client/.github/workflows/trivy-container-scan.yml@develop
uses: iris-connect/iris-client/.github/workflows/subs/trivy-container-scan.yml@develop
with:
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']"
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
name: FE e2e Test

on:
push:
branches:
- main
- release
- 1.**
workflow_call:

jobs:
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit d00c63a

Please sign in to comment.