Skip to content

Commit

Permalink
GHA: Fix condition for duplicate checks post-merge
Browse files Browse the repository at this point in the history
Despite #644, duplicate checks are still being triggered post-merge.
The following condition seemed intuitive:

- github.event_name != 'push' || github.event.pull_request.merged == false

But it turns out that `pull_request.merged` is still false on merge, which allows the job to proceed.
(see https://github.com/BbolroC/cc-guest-components/actions/runs/10215060610/workflow)

This commit focuses solely on `github.event_name != 'push'`, which is true on merge.
(see https://github.com/BbolroC/cc-guest-components/actions/runs/10215137827/workflow)

Signed-off-by: Hyounggyu Choi <[email protected]>
  • Loading branch information
BbolroC committed Aug 2, 2024
1 parent 06d0c7e commit 4647ec5
Show file tree
Hide file tree
Showing 11 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/aa_basic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ concurrency:

jobs:
basic_ci:
if: github.event_name != 'push' || github.event.pull_request.merged == false
if: github.event_name != 'push'
name: Check
defaults:
run:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/aa_cc_kbc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ concurrency:

jobs:
cc_kbc_ci:
if: github.event_name != 'push' || github.event.pull_request.merged == false
if: github.event_name != 'push'
name: Check
defaults:
run:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/aa_crypto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ concurrency:

jobs:
crypto_ci:
if: github.event_name != 'push' || github.event.pull_request.merged == false
if: github.event_name != 'push'
name: Check
defaults:
run:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/aa_eaa_kbc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ concurrency:

jobs:
eaa_kbc_ci:
if: github.event_name != 'push' || github.event.pull_request.merged == false
if: github.event_name != 'push'
name: Check
defaults:
run:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/aa_occlum_sgx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ concurrency:

jobs:
occlum_sgx_ci:
if: github.event_name != 'push' || github.event.pull_request.merged == false
if: github.event_name != 'push'
runs-on: sgx
steps:
- name: Checkout Code
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/aa_sample_keyprovider.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ concurrency:

jobs:
coco_keyprovider_ci:
if: github.event_name != 'push' || github.event.pull_request.merged == false
if: github.event_name != 'push'
name: Check
runs-on: ubuntu-latest
strategy:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/aa_sev_kbc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ concurrency:

jobs:
offline_sev_kbc_ci:
if: github.event_name != 'push' || github.event.pull_request.merged == false
if: github.event_name != 'push'
name: Check
defaults:
run:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/api-server-rest-basic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ concurrency:

jobs:
basic_ci:
if: github.event_name != 'push' || github.event.pull_request.merged == false
if: github.event_name != 'push'
name: Check
defaults:
run:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cdh_basic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ concurrency:

jobs:
basic_ci:
if: github.event_name != 'push' || github.event.pull_request.merged == false
if: github.event_name != 'push'
name: Check
defaults:
run:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/image_rs_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ concurrency:

jobs:
ci:
if: github.event_name != 'push' || github.event.pull_request.merged == false
if: github.event_name != 'push'
name: Check
defaults:
run:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ocicrypt_rs_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ concurrency:

jobs:
ci:
if: github.event_name != 'push' || github.event.pull_request.merged == false
if: github.event_name != 'push'
name: Check
runs-on: ubuntu-latest
strategy:
Expand Down

0 comments on commit 4647ec5

Please sign in to comment.