diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b9d9698bd..ef0db729b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,6 +5,7 @@ on: branches: [main, "release/**"] pull_request: branches: [main, "release/**"] + merge_group: workflow_dispatch: schedule: - cron: "0 18 * * 0" diff --git a/.github/workflows/secret-scan.yml b/.github/workflows/secret-scan.yml index cd49c707f..8d608f2a1 100644 --- a/.github/workflows/secret-scan.yml +++ b/.github/workflows/secret-scan.yml @@ -5,6 +5,7 @@ on: branches: [main, "release/**"] pull_request: branches: [main, "release/**"] + merge_group: workflow_dispatch: concurrency: @@ -29,6 +30,9 @@ jobs: persist-credentials: false - name: Scan for secrets + # gitleaks/gitleaks-action@v3 does not support the merge_group event; + # the scan already ran on pull_request so skipping here is safe. + if: github.event_name != 'merge_group' uses: gitleaks/gitleaks-action@v3 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}