Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion .github/workflows/test-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,14 @@ env:

jobs:
changes:
# Docker validation runs on source PRs, not temporary Mergify queue candidates.
if: >-
${{
github.event_name != 'pull_request' ||
github.event.pull_request.user.login != 'mergify[bot]' ||
github.event.pull_request.head.repo.full_name != github.repository ||
!startsWith(github.event.pull_request.head.ref, 'mergify/merge-queue/')
}}
runs-on: ubuntu-latest
timeout-minutes: 5
outputs:
Expand Down Expand Up @@ -210,7 +218,7 @@ jobs:

test-docker:
runs-on: ubuntu-latest
if: always()
if: always() && needs.changes.result != 'skipped'
needs:
- changes
- build-docker-image
Expand Down
16 changes: 15 additions & 1 deletion .github/workflows/trigger-integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,21 @@ jobs:
# Fork PRs do not receive repository secrets on pull_request events.
# Skip the job on fork PRs; maintainers can still run it manually via
# workflow_dispatch with the PR number as input.
if: ${{ (github.event_name == 'pull_request' && !github.event.pull_request.head.repo.fork) || (github.event_name == 'push' && github.ref_name == 'main') || github.event_name == 'workflow_dispatch' }}
# Mergify queue candidates reuse the source PR's integration result.
if: >-
${{
(
github.event_name != 'pull_request' ||
github.event.pull_request.user.login != 'mergify[bot]' ||
github.event.pull_request.head.repo.full_name != github.repository ||
!startsWith(github.event.pull_request.head.ref, 'mergify/merge-queue/')
) &&
(
(github.event_name == 'pull_request' && !github.event.pull_request.head.repo.fork) ||
(github.event_name == 'push' && github.ref_name == 'main') ||
github.event_name == 'workflow_dispatch'
)
}}
runs-on: ubuntu-latest
permissions:
# Needed to post a sticky comment on the PR when triggered manually.
Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/zfnd-deploy-nodes-gcp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,14 @@ jobs:
# the trigger. Downstream jobs read `set-matrix` outputs so the event →
# environment mapping is computed once.
set-matrix:
# Deployment image tests run on source PRs, not temporary Mergify queue candidates.
if: >-
${{
github.event_name != 'pull_request' ||
github.event.pull_request.user.login != 'mergify[bot]' ||
github.event.pull_request.head.repo.full_name != github.repository ||
!startsWith(github.event.pull_request.head.ref, 'mergify/merge-queue/')
}}
runs-on: ubuntu-latest
outputs:
networks: ${{ steps.set-matrix.outputs.networks }}
Expand Down
Loading