Skip to content

Commit 5c76ead

Browse files
Commit with unresolved merge conflicts
1 parent 7d8267c commit 5c76ead

File tree

5 files changed

+23
-3
lines changed

5 files changed

+23
-3
lines changed

β€Ž.github/workflows/_reusable_run_tests.ymlβ€Ž

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,18 @@ on:
1919
run_critical_flows:
2020
type: boolean
2121
required: true
22+
<<<<<<< HEAD
2223
testiny_run_name:
2324
type: string
2425
required: false
2526
default: ''
27+
=======
28+
notify:
29+
type: string
30+
required: true
31+
default: 'failure' # values: always | failure | never
32+
33+
>>>>>>> 13919ac7e9 (chore: update github action notify on Wire - WPB-24093 πŸ’ (#4469))
2634
secrets:
2735
ZENKINS_USERNAME:
2836
required: true
@@ -297,10 +305,10 @@ jobs:
297305
echo "commit_sha=$(git rev-parse HEAD)" >> $GITHUB_ENV
298306
echo "commit_message=$(git log -1 --pretty=format:"%s")" >> $GITHUB_ENV
299307
300-
- name: Notify on Wire for iOS Nightly πŸ€–
308+
- name: Always Notify on Wire
301309
uses: 8398a7/action-slack@v3
302310
continue-on-error: true
303-
if: ${{ inputs.all && always() }}
311+
if: ${{ inputs.notify == 'always' && always() }}
304312
with:
305313
status: ${{ job.status }}
306314
text: |
@@ -310,11 +318,16 @@ jobs:
310318
**Commit:** [${{ env.commit_sha }}](https://github.com/wireapp/wire-ios-mono/commit/${{ env.commit_sha }})
311319
**Triggered by:** ${{ github.triggering_actor }}
312320
**Build log:** ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
321+
<<<<<<< HEAD
313322

314323
- name: Notify on Wire for iOS CI
324+
=======
325+
326+
- name: Only Notify on Wire failures
327+
>>>>>>> 13919ac7e9 (chore: update github action notify on Wire - WPB-24093 πŸ’ (#4469))
315328
uses: 8398a7/action-slack@v3
316329
continue-on-error: true
317-
if: ${{ !inputs.all && failure() }}
330+
if: ${{ inputs.notify == 'failure' && failure() }}
318331
with:
319332
status: ${{ job.status }}
320333
text: |

β€Ž.github/workflows/critical_flows.yamlβ€Ž

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,9 @@ jobs:
2626
notify_secret: WIRE_IOS_QA_WEBHOOK
2727
test_dependencies: false
2828
run_critical_flows: true
29+
<<<<<<< HEAD
2930
testiny_run_name: ${{ inputs.testiny_run_name }}
31+
=======
32+
notify: always
33+
>>>>>>> 13919ac7e9 (chore: update github action notify on Wire - WPB-24093 πŸ’ (#4469))
3034
secrets: inherit

β€Ž.github/workflows/run_all_tests.ymlβ€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@ jobs:
1414
all: true
1515
notify_secret: WIRE_IOS_CI_WEBHOOK
1616
run_critical_flows: true
17+
notify: always
1718
secrets: inherit

β€Ž.github/workflows/test_develop.ymlβ€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,5 @@ jobs:
2121
branch: ${{ matrix.branch }}
2222
notify_secret: WIRE_IOS_NIGHTLY_WEBHOOK
2323
run_critical_flows: true
24+
notify: always
2425
secrets: inherit

β€Ž.github/workflows/test_pr_changes.ymlβ€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,4 +103,5 @@ jobs:
103103
notify_secret: WIRE_IOS_CI_WEBHOOK
104104
test_dependencies: ${{ github.event_name != 'pull_request' || startsWith(github.base_ref, 'release/cycle') }} # run on merge_queue or release branch PRs
105105
run_critical_flows: false # separare workflow
106+
notify: failure
106107
secrets: inherit

0 commit comments

Comments
Β (0)