@@ -39,10 +39,10 @@ jobs:
3939 - name : Run Zizmor scan
4040 uses : open-edge-platform/geti-ci/actions/zizmor@3a4b81ea648711eb638b34757427cd3ef71d19f1
4141 with :
42- scan-scope : ${{ github.event_name == 'pull_request' && 'changed' || 'all' }}
42+ scan-scope : ${{ ( github.event_name == 'pull_request' || github.event_name == 'merge_group') && 'changed' || 'all' }}
4343 severity-level : " LOW"
4444 confidence-level : " LOW"
45- fail-on-findings : ${{ github.event_name == 'pull_request' && 'true' || 'false' }}
45+ fail-on-findings : ${{ ( github.event_name == 'pull_request' || github.event_name == 'merge_group') && 'true' || 'false' }}
4646
4747 bandit-scan :
4848 runs-on : ubuntu-latest
@@ -55,15 +55,15 @@ jobs:
5555 - name : Run Bandit scan
5656 uses : open-edge-platform/geti-ci/actions/bandit@3a4b81ea648711eb638b34757427cd3ef71d19f1
5757 with :
58- scan-scope : ${{ github.event_name == 'pull_request' && 'changed' || 'all' }}
58+ scan-scope : ${{ ( github.event_name == 'pull_request' || github.event_name == 'merge_group') && 'changed' || 'all' }}
5959 severity-level : " LOW"
6060 confidence-level : " LOW"
6161 config_file : " pyproject.toml"
62- fail-on-findings : ${{ github.event_name == 'pull_request' && 'true' || 'false' }}
62+ fail-on-findings : ${{ ( github.event_name == 'pull_request' || github.event_name == 'merge_group') && 'true' || 'false' }}
6363
6464 trivy-scan :
6565 runs-on : ubuntu-latest
66- if : github.event_name != 'pull_request '
66+ if : github.event_name == 'push' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch '
6767 permissions :
6868 contents : read
6969 security-events : write # Needed to upload the results to code-scanning dashboard
9696 - name : Run Semgrep scan
9797 uses : open-edge-platform/geti-ci/actions/semgrep@3a4b81ea648711eb638b34757427cd3ef71d19f1
9898 with :
99- scan-scope : ${{ github.event_name == 'pull_request' && 'changed' || 'all' }}
99+ scan-scope : ${{ ( github.event_name == 'pull_request' || github.event_name == 'merge_group') && 'changed' || 'all' }}
100100 severity : " LOW"
101- fail-on-findings : ${{ github.event_name == 'pull_request' && 'true' || 'false' }}
101+ fail-on-findings : ${{ ( github.event_name == 'pull_request' || github.event_name == 'merge_group') && 'true' || 'false' }}
0 commit comments