Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow the check_labels CI job to run concurrently with other jobs #16806

Merged
merged 1 commit into from
Sep 12, 2022
Merged

Allow the check_labels CI job to run concurrently with other jobs #16806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 2 additions & 11 deletions .github/workflows/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ jobs:
!= 'DOCS_ONLY')
name: Bootstrap Pants, test and lint Rust (Linux-x86_64)
needs:
- check_labels
- docs_only_check
runs-on:
- ubuntu-20.04
Expand Down Expand Up @@ -161,7 +160,6 @@ jobs:
!= 'DOCS_ONLY')
name: Bootstrap Pants, test Rust (macOS11-x86_64)
needs:
- check_labels
- docs_only_check
runs-on:
- macos-11
Expand Down Expand Up @@ -298,7 +296,6 @@ jobs:
!= 'DOCS_ONLY')
name: Build wheels and fs_util (Linux-x86_64)
needs:
- check_labels
- docs_only_check
runs-on:
- ubuntu-20.04
Expand Down Expand Up @@ -384,7 +381,6 @@ jobs:
!= 'DOCS_ONLY')
name: Build wheels and fs_util (macOS10-15-x86_64)
needs:
- check_labels
- docs_only_check
runs-on:
- macOS-10.15-X64
Expand Down Expand Up @@ -487,7 +483,6 @@ jobs:
!= 'DOCS_ONLY')
name: Bootstrap Pants, build wheels and fs_util (macOS11-ARM64)
needs:
- check_labels
- docs_only_check
runs-on:
- macOS-11-ARM64
Expand Down Expand Up @@ -627,7 +622,6 @@ jobs:
!= 'DOCS_ONLY')
name: Build wheels and fs_util (macOS11-x86_64)
needs:
- check_labels
- docs_only_check
runs-on:
- macos-11
Expand Down Expand Up @@ -767,7 +761,6 @@ jobs:
name: Lint Python and Shell
needs:
- bootstrap_pants_linux_x86_64
- check_labels
- docs_only_check
runs-on:
- ubuntu-20.04
Expand Down Expand Up @@ -849,6 +842,7 @@ jobs:
name: Set Merge OK
needs:
- docs_only_check
- check_labels
outputs:
merge_ok: ${{ steps.set_merge_ok.outputs.merge_ok }}
runs-on:
Expand All @@ -861,6 +855,7 @@ jobs:
name: Set Merge OK
needs:
- docs_only_check
- check_labels
- bootstrap_pants_linux_x86_64
- bootstrap_pants_macos11_x86_64
- build_wheels_linux_x86_64
Expand All @@ -887,7 +882,6 @@ jobs:
name: Test Python (Linux-x86_64) Shard 0/3
needs:
- bootstrap_pants_linux_x86_64
- check_labels
- docs_only_check
runs-on:
- ubuntu-20.04
Expand Down Expand Up @@ -979,7 +973,6 @@ jobs:
name: Test Python (Linux-x86_64) Shard 1/3
needs:
- bootstrap_pants_linux_x86_64
- check_labels
- docs_only_check
runs-on:
- ubuntu-20.04
Expand Down Expand Up @@ -1071,7 +1064,6 @@ jobs:
name: Test Python (Linux-x86_64) Shard 2/3
needs:
- bootstrap_pants_linux_x86_64
- check_labels
- docs_only_check
runs-on:
- ubuntu-20.04
Expand Down Expand Up @@ -1165,7 +1157,6 @@ jobs:
name: Test Python (macOS11-x86_64)
needs:
- bootstrap_pants_macos11_x86_64
- check_labels
- docs_only_check
runs-on:
- macos-11
Expand Down
4 changes: 2 additions & 2 deletions build-support/bin/generate_github_workflows.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -918,7 +918,7 @@ def set_merge_ok(needs: list[str], docs_only: bool) -> Jobs:
# If in the future we have any docs-related checks, we can make both "Set Merge OK"
# jobs depend on them here (it has to be both since some changes may modify docs
# as well as code, and so are not "docs only").
"needs": ["docs_only_check"] + sorted(needs),
"needs": ["docs_only_check", "check_labels"] + sorted(needs),
"outputs": {"merge_ok": "${{ steps.set_merge_ok.outputs.merge_ok }}"},
"steps": [
{
Expand Down Expand Up @@ -978,7 +978,7 @@ def generate() -> dict[Path, str]:
needs = val.get("needs", [])
if isinstance(needs, str):
needs = [needs]
needs.extend(["check_labels", "docs_only_check"])
needs.extend(["docs_only_check"])
val["needs"] = needs
if_cond = val.get("if")
val["if"] = not_docs_only if if_cond is None else f"({if_cond}) && ({not_docs_only})"
Expand Down