Skip to content

Commit 6583aa2

Browse files
committed
Make workflows cancellable.
1 parent 556cb73 commit 6583aa2

1 file changed

Lines changed: 12 additions & 12 deletions

File tree

.github/workflows/rtpproxy_ci.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -105,17 +105,17 @@ jobs:
105105
name: Build Packages
106106
needs: [LoadJobs_conf, FullBuild]
107107
uses: sippy/cimagic/.github/workflows/BuildDPKGs.yml@v2
108-
if: always() && needs.LoadJobs_conf.outputs.do_BuildPackages == 'true' &&
109-
(needs.LoadJobs_conf.outputs.do_FullBuild != 'true' || needs.FullBuild.result == 'success')
108+
if: ${{ !cancelled() && (success() || failure()) && needs.LoadJobs_conf.outputs.do_BuildPackages == 'true' &&
109+
(needs.LoadJobs_conf.outputs.do_FullBuild != 'true' || needs.FullBuild.result == 'success') }}
110110
with:
111111
apt_depends: pkg-config libssl-dev libbcg729-dev libgsm1-dev libsndfile1-dev libunwind-dev libsrtp2-dev libsystemd-dev systemd procps
112112
test_dpkgs_script: ./scripts/do-dpkg-test.sh
113113

114114
FullBuild:
115115
name: Full Build
116116
needs: [LoadJobs_conf, MinBuild]
117-
if: always() && needs.LoadJobs_conf.outputs.do_FullBuild == 'true' &&
118-
(needs.LoadJobs_conf.outputs.do_MinBuild != 'true' || needs.MinBuild.result == 'success')
117+
if: ${{ !cancelled() && (success() || failure()) && needs.LoadJobs_conf.outputs.do_FullBuild == 'true' &&
118+
(needs.LoadJobs_conf.outputs.do_MinBuild != 'true' || needs.MinBuild.result == 'success') }}
119119
# The type of runner that the job will run on
120120
runs-on: ubuntu-${{ matrix.os }}
121121
env:
@@ -189,8 +189,8 @@ jobs:
189189
FuncTest:
190190
name: Functional Testing
191191
needs: [LoadJobs_conf, FullBuild]
192-
if: always() && needs.LoadJobs_conf.outputs.do_FuncTest == 'true' &&
193-
(needs.LoadJobs_conf.outputs.do_FullBuild != 'true' || needs.FullBuild.result == 'success')
192+
if: ${{ !cancelled() && (success() || failure()) && needs.LoadJobs_conf.outputs.do_FuncTest == 'true' &&
193+
(needs.LoadJobs_conf.outputs.do_FullBuild != 'true' || needs.FullBuild.result == 'success') }}
194194
# The type of runner that the job will run on
195195
runs-on: ubuntu-${{ matrix.os }}
196196
env:
@@ -263,8 +263,8 @@ jobs:
263263
Glitching:
264264
name: Glitch Injection
265265
needs: [LoadJobs_conf, FuncTest]
266-
if: always() && needs.LoadJobs_conf.outputs.do_Glitch == 'true' &&
267-
(needs.LoadJobs_conf.outputs.do_FuncTest != 'true' || needs.FuncTest.result == 'success')
266+
if: ${{ !cancelled() && (success() || failure()) && needs.LoadJobs_conf.outputs.do_Glitch == 'true' &&
267+
(needs.LoadJobs_conf.outputs.do_FuncTest != 'true' || needs.FuncTest.result == 'success') }}
268268
# The type of runner that the job will run on
269269
runs-on: ubuntu-${{ matrix.os }}
270270
env:
@@ -337,8 +337,8 @@ jobs:
337337
Fuzzing:
338338
name: Fuzz with OSS-Fuzz
339339
needs: [LoadJobs_conf, Glitching]
340-
if: always() && needs.LoadJobs_conf.outputs.do_Fuzzing == 'true' &&
341-
(needs.LoadJobs_conf.outputs.do_Glitch != 'true' || needs.Glitching.result == 'success')
340+
if: ${{ !cancelled() && (success() || failure()) && needs.LoadJobs_conf.outputs.do_Fuzzing == 'true' &&
341+
(needs.LoadJobs_conf.outputs.do_Glitch != 'true' || needs.Glitching.result == 'success') }}
342342
runs-on: ubuntu-latest
343343
permissions:
344344
security-events: write
@@ -387,9 +387,9 @@ jobs:
387387
Docker:
388388
name: Build&Push to DockerHub
389389
needs: [LoadJobs_conf, Fuzzing]
390-
if: always() && needs.LoadJobs_conf.outputs.do_Docker == 'true' &&
390+
if: ${{ !cancelled() && (success() || failure()) && needs.LoadJobs_conf.outputs.do_Docker == 'true' &&
391391
(needs.LoadJobs_conf.outputs.do_Fuzzing != 'true' || needs.Fuzzing.result == 'success') &&
392-
(github.event_name == 'push' || github.event_name == 'pull_request')
392+
(github.event_name == 'push' || github.event_name == 'pull_request') }}
393393
runs-on: ubuntu-latest
394394
permissions:
395395
packages: write

0 commit comments

Comments
 (0)