diff --git a/.github/workflows/ci-control.yml b/.github/workflows/ci-control.yml index cedcc5a2dc..a91d0ea827 100644 --- a/.github/workflows/ci-control.yml +++ b/.github/workflows/ci-control.yml @@ -49,10 +49,12 @@ jobs: per_page: 100, }); const bootstrapped = jobs.some((job) => - job.name === 'Bootstrap PR CI' || - job.name === 'Bootstrap main CI' || - job.name.startsWith('Bootstrap PR CI / ') || - job.name.startsWith('Bootstrap main CI / ') + job.conclusion !== 'skipped' && ( + job.name === 'Bootstrap PR CI' || + job.name === 'Bootstrap main CI' || + job.name.startsWith('Bootstrap PR CI / ') || + job.name.startsWith('Bootstrap main CI / ') + ) ); core.setOutput('should_dispatch', String(!bootstrapped)); if (bootstrapped) return; diff --git a/scripts/tests/test_ci_lane_workflows.py b/scripts/tests/test_ci_lane_workflows.py index 5e692249b6..f7c14cbccf 100644 --- a/scripts/tests/test_ci_lane_workflows.py +++ b/scripts/tests/test_ci_lane_workflows.py @@ -37,6 +37,7 @@ def test_controller_does_not_dispatch_bootstrap_or_fork_runs(self) -> None: self.assertIn("job.name === 'Bootstrap PR CI'", workflow) self.assertIn("job.name.startsWith('Bootstrap PR CI / ')", workflow) self.assertIn("job.name.startsWith('Bootstrap main CI / ')", workflow) + self.assertIn("job.conclusion !== 'skipped'", workflow) self.assertIn("head_repository.full_name == github.repository", workflow) self.assertIn("should_dispatch", workflow)