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

Use explicit depths on fetches when running cherry-picks in CI #19127

Merged
merged 1 commit into from
May 24, 2023
Merged

Use explicit depths on fetches when running cherry-picks in CI #19127

merged 1 commit into from
May 24, 2023

Conversation

huonw
Copy link
Contributor

@huonw huonw commented May 24, 2023 •
edited
Loading

This patch (hopefully!) fixes the cherry-picking script when running in CI, in a shallow repository.

actions/checkout, by default, creates a shallow clone that contains only the HEAD commit of the default branch, doing git clone --depth=1 .... This means git operations in that checkout don't have access to the full history. For doing a cherry-pick, access to history is critical: to pick $COMMIT, the contents of the parent $COMMIT^ need to be available, to compute the diff.

This PR resolves the situation (and makes the script faster) by making the git fetches explicitly about how much history they need:

  • fetching the commit to be cherry-picked requires both the commit and its parent, so --depth=2 ensures that they're both available, no matter what the original HEAD of the CI check-out was
  • creating the cherry-picking branch from the milestone branch only needs the HEAD of that branch, so --depth=1 is fine, and saves time by not cloning the full history

Without the explicit arg, git fetch ... some_ref has unhelpful behaviour:

  • if some_ref already exists in the local checkout (which can occur if $COMMIT the latest commit on the default branch), it fetches too little, by doing nothing at all
  • if some_ref doesn't exist in the local checkout, if fetches too much, by pulling down the whole history

Passing --depth to git fetch will truncate the log (setting the "shallow boundary"), so I've conditionalised this to only use the --depth args when actually running in CI. If someone runs it locally, it'll just do full history fetches, which is fine: an interactive user will typically have all the history available already anyway.

Fixes #19082

This was inspired by @thejcannon's learnings in #19125.

@huonw huonw mentioned this pull request May 24, 2023
Merged
@huonw huonw added the category:internal CI, fixes for not-yet-released features, etc. label May 24, 2023
@huonw huonw force-pushed the bugfix/19082-cherry-pick-shallow branch from 711236e to 363366d Compare May 24, 2023 03:55
@huonw huonw marked this pull request as ready for review May 24, 2023 03:58
@huonw huonw requested review from stuhood, benjyw and thejcannon May 24, 2023 03:58
@huonw huonw changed the title Use shallow fetches when running cherry-picks in CI Use explicit depths on fetches when running cherry-picks in CI May 24, 2023
@stuhood stuhood merged commit 99c1669 into pantsbuild:main May 24, 2023
@stuhood
Copy link
Member

stuhood commented May 24, 2023

It doesn't look like this worked, unfortunately: https://github.com/pantsbuild/pants/actions/runs/5071876082/jobs/9108835133

@thejcannon
Copy link
Member

Yeah, @huonw mind if we back this out? I'll reopen my PR.

@huonw
Copy link
Contributor Author

huonw commented May 24, 2023

Oh, the -x logs show problem is the env var is CI=true, not CI=1. Once I'm back at a computer I can fix this one to work as intended.

@huonw huonw mentioned this pull request May 24, 2023
Merged
@huonw huonw deleted the bugfix/19082-cherry-pick-shallow branch May 24, 2023 21:46
@huonw
Copy link
Contributor Author

huonw commented May 24, 2023

#19141

cognifloyd pushed a commit that referenced this pull request May 25, 2023
@huonw
Check for CI=true, not CI=1 for cherry-picking (#19141)
de9339a 
This fixes #19127, which accidentally checked for `CI=1` to determine if
it's running on CI, but CI services (and GHA in particular) actually
[set
`CI=true`](https://docs.github.com/en/actions/learn-github-actions/variables#default-environment-variables),
and so the script was operating in (unchanged) local mode on CI 💥

This will fix a bug with #19125 if running on the second commit on
`main` (i.e. `HEAD^`), and so adjusts the `fetch-depth` comment to
explain that. This patch also ensures the shallow-clone optimisations
apply on CI.
illicitonion added a commit to illicitonion/pants that referenced this pull request May 26, 2023
@illicitonion
Prep for 2.18.0.dev0
c03a606 
Internal changes:

* Fix TypedDict construction ([pantsbuild#19166](pantsbuild#19166))

* Have package_dists.InvalidEntryPoint subclass InvalidFieldException ([pantsbuild#19149](pantsbuild#19149))

* Check for `CI=true`, not `CI=1` for cherry-picking ([pantsbuild#19141](pantsbuild#19141))

* Set up remote caching in CI  ([pantsbuild#19144](pantsbuild#19144))

* refactor(internal): adjust pants_venv venv_dir calculation ([pantsbuild#19140](pantsbuild#19140))

* Prepare `2.16.0rc4`. ([pantsbuild#19146](pantsbuild#19146))

* Warn about `files()` in PEXes in one place ([pantsbuild#19027](pantsbuild#19027))

* Drop our explicit dep on `syn` ([pantsbuild#19134](pantsbuild#19134))

* Fix auto-cherry-picker's merge-conflicts ([pantsbuild#19125](pantsbuild#19125))

* Use explicit depths on fetches when running cherry-picks in CI ([pantsbuild#19127](pantsbuild#19127))

* Make determine_python() pin to 3.9 ([pantsbuild#19116](pantsbuild#19116))

* Upgrade to `actions/checkout@v3` ([pantsbuild#19112](pantsbuild#19112))

* Run the cherry pick script with `-x` for debugging ([pantsbuild#19095](pantsbuild#19095))

* Add more linux x86 test CI shards ([pantsbuild#19099](pantsbuild#19099))

* Use a trait for remote ByteStore network implementation ([pantsbuild#19050](pantsbuild#19050))

* Increase the logging of release version file publishing. ([pantsbuild#19092](pantsbuild#19092))

* Remove the Toolchain plugin ([pantsbuild#18978](pantsbuild#18978))

* Fix bad merge of pantsbuild#18829. ([pantsbuild#19080](pantsbuild#19080))

* Revert "Implement layout="zip" for Lambda/GCF, skipping lambdex" ([pantsbuild#19071](pantsbuild#19071))

* Remove unnecessary interpreter constraint config. ([pantsbuild#19065](pantsbuild#19065))

* Use hand-written change detection for PR/push job trimming ([pantsbuild#19045](pantsbuild#19045))

* Do not build wheels on push, since that is now accomplished by the release job. ([pantsbuild#19063](pantsbuild#19063))

* Additional release job publishing fixes ([pantsbuild#19058](pantsbuild#19058))

* Change CI trigger to includelist `main` and `2.*.x` ([pantsbuild#19059](pantsbuild#19059))

* Release doc and script fixes ([pantsbuild#19043](pantsbuild#19043))

* Update cherry-picker to use `pull_request_target` ([pantsbuild#19048](pantsbuild#19048))

* Prepare `2.16.0rc3`. ([pantsbuild#19044](pantsbuild#19044))

* Prepare `2.15.1`. ([pantsbuild#19042](pantsbuild#19042))

* Fixup welcome-newcomers.yaml ([pantsbuild#19039](pantsbuild#19039))
@illicitonion illicitonion mentioned this pull request May 26, 2023
Merged
illicitonion added a commit to illicitonion/pants that referenced this pull request May 26, 2023
@illicitonion
Prep for 2.18.0.dev0
d0c9bb3 
Internal changes:

* Fix TypedDict construction ([pantsbuild#19166](pantsbuild#19166))

* Have package_dists.InvalidEntryPoint subclass InvalidFieldException ([pantsbuild#19149](pantsbuild#19149))

* Check for `CI=true`, not `CI=1` for cherry-picking ([pantsbuild#19141](pantsbuild#19141))

* Set up remote caching in CI  ([pantsbuild#19144](pantsbuild#19144))

* refactor(internal): adjust pants_venv venv_dir calculation ([pantsbuild#19140](pantsbuild#19140))

* Prepare `2.16.0rc4`. ([pantsbuild#19146](pantsbuild#19146))

* Warn about `files()` in PEXes in one place ([pantsbuild#19027](pantsbuild#19027))

* Drop our explicit dep on `syn` ([pantsbuild#19134](pantsbuild#19134))

* Fix auto-cherry-picker's merge-conflicts ([pantsbuild#19125](pantsbuild#19125))

* Use explicit depths on fetches when running cherry-picks in CI ([pantsbuild#19127](pantsbuild#19127))

* Make determine_python() pin to 3.9 ([pantsbuild#19116](pantsbuild#19116))

* Upgrade to `actions/checkout@v3` ([pantsbuild#19112](pantsbuild#19112))

* Run the cherry pick script with `-x` for debugging ([pantsbuild#19095](pantsbuild#19095))

* Add more linux x86 test CI shards ([pantsbuild#19099](pantsbuild#19099))

* Use a trait for remote ByteStore network implementation ([pantsbuild#19050](pantsbuild#19050))

* Increase the logging of release version file publishing. ([pantsbuild#19092](pantsbuild#19092))

* Remove the Toolchain plugin ([pantsbuild#18978](pantsbuild#18978))

* Fix bad merge of pantsbuild#18829. ([pantsbuild#19080](pantsbuild#19080))

* Revert "Implement layout="zip" for Lambda/GCF, skipping lambdex" ([pantsbuild#19071](pantsbuild#19071))

* Remove unnecessary interpreter constraint config. ([pantsbuild#19065](pantsbuild#19065))

* Use hand-written change detection for PR/push job trimming ([pantsbuild#19045](pantsbuild#19045))

* Do not build wheels on push, since that is now accomplished by the release job. ([pantsbuild#19063](pantsbuild#19063))

* Additional release job publishing fixes ([pantsbuild#19058](pantsbuild#19058))

* Change CI trigger to includelist `main` and `2.*.x` ([pantsbuild#19059](pantsbuild#19059))

* Release doc and script fixes ([pantsbuild#19043](pantsbuild#19043))

* Update cherry-picker to use `pull_request_target` ([pantsbuild#19048](pantsbuild#19048))

* Prepare `2.16.0rc3`. ([pantsbuild#19044](pantsbuild#19044))

* Prepare `2.15.1`. ([pantsbuild#19042](pantsbuild#19042))

* Fixup welcome-newcomers.yaml ([pantsbuild#19039](pantsbuild#19039))
illicitonion added a commit to illicitonion/pants that referenced this pull request May 26, 2023
@illicitonion
Prep for 2.18.0.dev0
9588d76 
Internal changes:

* Fix TypedDict construction ([pantsbuild#19166](pantsbuild#19166))

* Have package_dists.InvalidEntryPoint subclass InvalidFieldException ([pantsbuild#19149](pantsbuild#19149))

* Check for `CI=true`, not `CI=1` for cherry-picking ([pantsbuild#19141](pantsbuild#19141))

* Set up remote caching in CI  ([pantsbuild#19144](pantsbuild#19144))

* refactor(internal): adjust pants_venv venv_dir calculation ([pantsbuild#19140](pantsbuild#19140))

* Prepare `2.16.0rc4`. ([pantsbuild#19146](pantsbuild#19146))

* Warn about `files()` in PEXes in one place ([pantsbuild#19027](pantsbuild#19027))

* Drop our explicit dep on `syn` ([pantsbuild#19134](pantsbuild#19134))

* Fix auto-cherry-picker's merge-conflicts ([pantsbuild#19125](pantsbuild#19125))

* Use explicit depths on fetches when running cherry-picks in CI ([pantsbuild#19127](pantsbuild#19127))

* Make determine_python() pin to 3.9 ([pantsbuild#19116](pantsbuild#19116))

* Upgrade to `actions/checkout@v3` ([pantsbuild#19112](pantsbuild#19112))

* Run the cherry pick script with `-x` for debugging ([pantsbuild#19095](pantsbuild#19095))

* Add more linux x86 test CI shards ([pantsbuild#19099](pantsbuild#19099))

* Use a trait for remote ByteStore network implementation ([pantsbuild#19050](pantsbuild#19050))

* Increase the logging of release version file publishing. ([pantsbuild#19092](pantsbuild#19092))

* Remove the Toolchain plugin ([pantsbuild#18978](pantsbuild#18978))

* Fix bad merge of pantsbuild#18829. ([pantsbuild#19080](pantsbuild#19080))

* Revert "Implement layout="zip" for Lambda/GCF, skipping lambdex" ([pantsbuild#19071](pantsbuild#19071))

* Remove unnecessary interpreter constraint config. ([pantsbuild#19065](pantsbuild#19065))

* Use hand-written change detection for PR/push job trimming ([pantsbuild#19045](pantsbuild#19045))

* Do not build wheels on push, since that is now accomplished by the release job. ([pantsbuild#19063](pantsbuild#19063))

* Additional release job publishing fixes ([pantsbuild#19058](pantsbuild#19058))

* Change CI trigger to includelist `main` and `2.*.x` ([pantsbuild#19059](pantsbuild#19059))

* Release doc and script fixes ([pantsbuild#19043](pantsbuild#19043))

* Update cherry-picker to use `pull_request_target` ([pantsbuild#19048](pantsbuild#19048))

* Prepare `2.16.0rc3`. ([pantsbuild#19044](pantsbuild#19044))

* Prepare `2.15.1`. ([pantsbuild#19042](pantsbuild#19042))

* Fixup welcome-newcomers.yaml ([pantsbuild#19039](pantsbuild#19039))
illicitonion added a commit to illicitonion/pants that referenced this pull request May 26, 2023
@illicitonion
Prep for 2.18.0.dev0
95c6d9f 
Internal changes:

* Fix TypedDict construction ([pantsbuild#19166](pantsbuild#19166))

* Have package_dists.InvalidEntryPoint subclass InvalidFieldException ([pantsbuild#19149](pantsbuild#19149))

* Check for `CI=true`, not `CI=1` for cherry-picking ([pantsbuild#19141](pantsbuild#19141))

* Set up remote caching in CI  ([pantsbuild#19144](pantsbuild#19144))

* refactor(internal): adjust pants_venv venv_dir calculation ([pantsbuild#19140](pantsbuild#19140))

* Prepare `2.16.0rc4`. ([pantsbuild#19146](pantsbuild#19146))

* Warn about `files()` in PEXes in one place ([pantsbuild#19027](pantsbuild#19027))

* Drop our explicit dep on `syn` ([pantsbuild#19134](pantsbuild#19134))

* Fix auto-cherry-picker's merge-conflicts ([pantsbuild#19125](pantsbuild#19125))

* Use explicit depths on fetches when running cherry-picks in CI ([pantsbuild#19127](pantsbuild#19127))

* Make determine_python() pin to 3.9 ([pantsbuild#19116](pantsbuild#19116))

* Upgrade to `actions/checkout@v3` ([pantsbuild#19112](pantsbuild#19112))

* Run the cherry pick script with `-x` for debugging ([pantsbuild#19095](pantsbuild#19095))

* Add more linux x86 test CI shards ([pantsbuild#19099](pantsbuild#19099))

* Use a trait for remote ByteStore network implementation ([pantsbuild#19050](pantsbuild#19050))

* Increase the logging of release version file publishing. ([pantsbuild#19092](pantsbuild#19092))

* Remove the Toolchain plugin ([pantsbuild#18978](pantsbuild#18978))

* Fix bad merge of pantsbuild#18829. ([pantsbuild#19080](pantsbuild#19080))

* Revert "Implement layout="zip" for Lambda/GCF, skipping lambdex" ([pantsbuild#19071](pantsbuild#19071))

* Remove unnecessary interpreter constraint config. ([pantsbuild#19065](pantsbuild#19065))

* Use hand-written change detection for PR/push job trimming ([pantsbuild#19045](pantsbuild#19045))

* Do not build wheels on push, since that is now accomplished by the release job. ([pantsbuild#19063](pantsbuild#19063))

* Additional release job publishing fixes ([pantsbuild#19058](pantsbuild#19058))

* Change CI trigger to includelist `main` and `2.*.x` ([pantsbuild#19059](pantsbuild#19059))

* Release doc and script fixes ([pantsbuild#19043](pantsbuild#19043))

* Update cherry-picker to use `pull_request_target` ([pantsbuild#19048](pantsbuild#19048))

* Prepare `2.16.0rc3`. ([pantsbuild#19044](pantsbuild#19044))

* Prepare `2.15.1`. ([pantsbuild#19042](pantsbuild#19042))

* Fixup welcome-newcomers.yaml ([pantsbuild#19039](pantsbuild#19039))
illicitonion added a commit to illicitonion/pants that referenced this pull request May 26, 2023
@illicitonion
Prep for 2.18.0.dev0
f6ac77a 
Internal changes:

* Fix TypedDict construction ([pantsbuild#19166](pantsbuild#19166))

* Have package_dists.InvalidEntryPoint subclass InvalidFieldException ([pantsbuild#19149](pantsbuild#19149))

* Check for `CI=true`, not `CI=1` for cherry-picking ([pantsbuild#19141](pantsbuild#19141))

* Set up remote caching in CI  ([pantsbuild#19144](pantsbuild#19144))

* refactor(internal): adjust pants_venv venv_dir calculation ([pantsbuild#19140](pantsbuild#19140))

* Prepare `2.16.0rc4`. ([pantsbuild#19146](pantsbuild#19146))

* Warn about `files()` in PEXes in one place ([pantsbuild#19027](pantsbuild#19027))

* Drop our explicit dep on `syn` ([pantsbuild#19134](pantsbuild#19134))

* Fix auto-cherry-picker's merge-conflicts ([pantsbuild#19125](pantsbuild#19125))

* Use explicit depths on fetches when running cherry-picks in CI ([pantsbuild#19127](pantsbuild#19127))

* Make determine_python() pin to 3.9 ([pantsbuild#19116](pantsbuild#19116))

* Upgrade to `actions/checkout@v3` ([pantsbuild#19112](pantsbuild#19112))

* Run the cherry pick script with `-x` for debugging ([pantsbuild#19095](pantsbuild#19095))

* Add more linux x86 test CI shards ([pantsbuild#19099](pantsbuild#19099))

* Use a trait for remote ByteStore network implementation ([pantsbuild#19050](pantsbuild#19050))

* Increase the logging of release version file publishing. ([pantsbuild#19092](pantsbuild#19092))

* Remove the Toolchain plugin ([pantsbuild#18978](pantsbuild#18978))

* Fix bad merge of pantsbuild#18829. ([pantsbuild#19080](pantsbuild#19080))

* Revert "Implement layout="zip" for Lambda/GCF, skipping lambdex" ([pantsbuild#19071](pantsbuild#19071))

* Remove unnecessary interpreter constraint config. ([pantsbuild#19065](pantsbuild#19065))

* Use hand-written change detection for PR/push job trimming ([pantsbuild#19045](pantsbuild#19045))

* Do not build wheels on push, since that is now accomplished by the release job. ([pantsbuild#19063](pantsbuild#19063))

* Additional release job publishing fixes ([pantsbuild#19058](pantsbuild#19058))

* Change CI trigger to includelist `main` and `2.*.x` ([pantsbuild#19059](pantsbuild#19059))

* Release doc and script fixes ([pantsbuild#19043](pantsbuild#19043))

* Update cherry-picker to use `pull_request_target` ([pantsbuild#19048](pantsbuild#19048))

* Prepare `2.16.0rc3`. ([pantsbuild#19044](pantsbuild#19044))

* Prepare `2.15.1`. ([pantsbuild#19042](pantsbuild#19042))

* Fixup welcome-newcomers.yaml ([pantsbuild#19039](pantsbuild#19039))
illicitonion added a commit to illicitonion/pants that referenced this pull request May 26, 2023
@illicitonion
Prep for 2.18.0.dev0
b78b232 
Internal changes:

* Fix TypedDict construction ([pantsbuild#19166](pantsbuild#19166))

* Have package_dists.InvalidEntryPoint subclass InvalidFieldException ([pantsbuild#19149](pantsbuild#19149))

* Check for `CI=true`, not `CI=1` for cherry-picking ([pantsbuild#19141](pantsbuild#19141))

* Set up remote caching in CI  ([pantsbuild#19144](pantsbuild#19144))

* refactor(internal): adjust pants_venv venv_dir calculation ([pantsbuild#19140](pantsbuild#19140))

* Prepare `2.16.0rc4`. ([pantsbuild#19146](pantsbuild#19146))

* Warn about `files()` in PEXes in one place ([pantsbuild#19027](pantsbuild#19027))

* Drop our explicit dep on `syn` ([pantsbuild#19134](pantsbuild#19134))

* Fix auto-cherry-picker's merge-conflicts ([pantsbuild#19125](pantsbuild#19125))

* Use explicit depths on fetches when running cherry-picks in CI ([pantsbuild#19127](pantsbuild#19127))

* Make determine_python() pin to 3.9 ([pantsbuild#19116](pantsbuild#19116))

* Upgrade to `actions/checkout@v3` ([pantsbuild#19112](pantsbuild#19112))

* Run the cherry pick script with `-x` for debugging ([pantsbuild#19095](pantsbuild#19095))

* Add more linux x86 test CI shards ([pantsbuild#19099](pantsbuild#19099))

* Use a trait for remote ByteStore network implementation ([pantsbuild#19050](pantsbuild#19050))

* Increase the logging of release version file publishing. ([pantsbuild#19092](pantsbuild#19092))

* Remove the Toolchain plugin ([pantsbuild#18978](pantsbuild#18978))

* Fix bad merge of pantsbuild#18829. ([pantsbuild#19080](pantsbuild#19080))

* Revert "Implement layout="zip" for Lambda/GCF, skipping lambdex" ([pantsbuild#19071](pantsbuild#19071))

* Remove unnecessary interpreter constraint config. ([pantsbuild#19065](pantsbuild#19065))

* Use hand-written change detection for PR/push job trimming ([pantsbuild#19045](pantsbuild#19045))

* Do not build wheels on push, since that is now accomplished by the release job. ([pantsbuild#19063](pantsbuild#19063))

* Additional release job publishing fixes ([pantsbuild#19058](pantsbuild#19058))

* Change CI trigger to includelist `main` and `2.*.x` ([pantsbuild#19059](pantsbuild#19059))

* Release doc and script fixes ([pantsbuild#19043](pantsbuild#19043))

* Update cherry-picker to use `pull_request_target` ([pantsbuild#19048](pantsbuild#19048))

* Prepare `2.16.0rc3`. ([pantsbuild#19044](pantsbuild#19044))

* Prepare `2.15.1`. ([pantsbuild#19042](pantsbuild#19042))

* Fixup welcome-newcomers.yaml ([pantsbuild#19039](pantsbuild#19039))
illicitonion added a commit to illicitonion/pants that referenced this pull request May 26, 2023
@illicitonion
Prep for 2.18.0.dev0
3bbdac7 
Internal changes:

* Fix TypedDict construction ([pantsbuild#19166](pantsbuild#19166))

* Have package_dists.InvalidEntryPoint subclass InvalidFieldException ([pantsbuild#19149](pantsbuild#19149))

* Check for `CI=true`, not `CI=1` for cherry-picking ([pantsbuild#19141](pantsbuild#19141))

* Set up remote caching in CI  ([pantsbuild#19144](pantsbuild#19144))

* refactor(internal): adjust pants_venv venv_dir calculation ([pantsbuild#19140](pantsbuild#19140))

* Prepare `2.16.0rc4`. ([pantsbuild#19146](pantsbuild#19146))

* Warn about `files()` in PEXes in one place ([pantsbuild#19027](pantsbuild#19027))

* Drop our explicit dep on `syn` ([pantsbuild#19134](pantsbuild#19134))

* Fix auto-cherry-picker's merge-conflicts ([pantsbuild#19125](pantsbuild#19125))

* Use explicit depths on fetches when running cherry-picks in CI ([pantsbuild#19127](pantsbuild#19127))

* Make determine_python() pin to 3.9 ([pantsbuild#19116](pantsbuild#19116))

* Upgrade to `actions/checkout@v3` ([pantsbuild#19112](pantsbuild#19112))

* Run the cherry pick script with `-x` for debugging ([pantsbuild#19095](pantsbuild#19095))

* Add more linux x86 test CI shards ([pantsbuild#19099](pantsbuild#19099))

* Use a trait for remote ByteStore network implementation ([pantsbuild#19050](pantsbuild#19050))

* Increase the logging of release version file publishing. ([pantsbuild#19092](pantsbuild#19092))

* Remove the Toolchain plugin ([pantsbuild#18978](pantsbuild#18978))

* Fix bad merge of pantsbuild#18829. ([pantsbuild#19080](pantsbuild#19080))

* Revert "Implement layout="zip" for Lambda/GCF, skipping lambdex" ([pantsbuild#19071](pantsbuild#19071))

* Remove unnecessary interpreter constraint config. ([pantsbuild#19065](pantsbuild#19065))

* Use hand-written change detection for PR/push job trimming ([pantsbuild#19045](pantsbuild#19045))

* Do not build wheels on push, since that is now accomplished by the release job. ([pantsbuild#19063](pantsbuild#19063))

* Additional release job publishing fixes ([pantsbuild#19058](pantsbuild#19058))

* Change CI trigger to includelist `main` and `2.*.x` ([pantsbuild#19059](pantsbuild#19059))

* Release doc and script fixes ([pantsbuild#19043](pantsbuild#19043))

* Update cherry-picker to use `pull_request_target` ([pantsbuild#19048](pantsbuild#19048))

* Prepare `2.16.0rc3`. ([pantsbuild#19044](pantsbuild#19044))

* Prepare `2.15.1`. ([pantsbuild#19042](pantsbuild#19042))

* Fixup welcome-newcomers.yaml ([pantsbuild#19039](pantsbuild#19039))
illicitonion added a commit to illicitonion/pants that referenced this pull request May 26, 2023
@illicitonion
Prep for 2.18.0.dev0
9e4d455 
Internal changes:

* Fix TypedDict construction ([pantsbuild#19166](pantsbuild#19166))

* Have package_dists.InvalidEntryPoint subclass InvalidFieldException ([pantsbuild#19149](pantsbuild#19149))

* Check for `CI=true`, not `CI=1` for cherry-picking ([pantsbuild#19141](pantsbuild#19141))

* Set up remote caching in CI  ([pantsbuild#19144](pantsbuild#19144))

* refactor(internal): adjust pants_venv venv_dir calculation ([pantsbuild#19140](pantsbuild#19140))

* Prepare `2.16.0rc4`. ([pantsbuild#19146](pantsbuild#19146))

* Warn about `files()` in PEXes in one place ([pantsbuild#19027](pantsbuild#19027))

* Drop our explicit dep on `syn` ([pantsbuild#19134](pantsbuild#19134))

* Fix auto-cherry-picker's merge-conflicts ([pantsbuild#19125](pantsbuild#19125))

* Use explicit depths on fetches when running cherry-picks in CI ([pantsbuild#19127](pantsbuild#19127))

* Make determine_python() pin to 3.9 ([pantsbuild#19116](pantsbuild#19116))

* Upgrade to `actions/checkout@v3` ([pantsbuild#19112](pantsbuild#19112))

* Run the cherry pick script with `-x` for debugging ([pantsbuild#19095](pantsbuild#19095))

* Add more linux x86 test CI shards ([pantsbuild#19099](pantsbuild#19099))

* Use a trait for remote ByteStore network implementation ([pantsbuild#19050](pantsbuild#19050))

* Increase the logging of release version file publishing. ([pantsbuild#19092](pantsbuild#19092))

* Remove the Toolchain plugin ([pantsbuild#18978](pantsbuild#18978))

* Fix bad merge of pantsbuild#18829. ([pantsbuild#19080](pantsbuild#19080))

* Revert "Implement layout="zip" for Lambda/GCF, skipping lambdex" ([pantsbuild#19071](pantsbuild#19071))

* Remove unnecessary interpreter constraint config. ([pantsbuild#19065](pantsbuild#19065))

* Use hand-written change detection for PR/push job trimming ([pantsbuild#19045](pantsbuild#19045))

* Do not build wheels on push, since that is now accomplished by the release job. ([pantsbuild#19063](pantsbuild#19063))

* Additional release job publishing fixes ([pantsbuild#19058](pantsbuild#19058))

* Change CI trigger to includelist `main` and `2.*.x` ([pantsbuild#19059](pantsbuild#19059))

* Release doc and script fixes ([pantsbuild#19043](pantsbuild#19043))

* Update cherry-picker to use `pull_request_target` ([pantsbuild#19048](pantsbuild#19048))

* Prepare `2.16.0rc3`. ([pantsbuild#19044](pantsbuild#19044))

* Prepare `2.15.1`. ([pantsbuild#19042](pantsbuild#19042))

* Fixup welcome-newcomers.yaml ([pantsbuild#19039](pantsbuild#19039))
illicitonion added a commit that referenced this pull request May 27, 2023
@illicitonion
Prep 2.18.0.dev0 (#19167)
a9e570f 
Internal changes:

* Fix TypedDict construction
([#19166](#19166))

* Have package_dists.InvalidEntryPoint subclass InvalidFieldException
([#19149](#19149))

* Check for `CI=true`, not `CI=1` for cherry-picking
([#19141](#19141))

* Set up remote caching in CI
([#19144](#19144))

* refactor(internal): adjust pants_venv venv_dir calculation
([#19140](#19140))

* Prepare `2.16.0rc4`.
([#19146](#19146))

* Warn about `files()` in PEXes in one place
([#19027](#19027))

* Drop our explicit dep on `syn`
([#19134](#19134))

* Fix auto-cherry-picker's merge-conflicts
([#19125](#19125))

* Use explicit depths on fetches when running cherry-picks in CI
([#19127](#19127))

* Make determine_python() pin to 3.9
([#19116](#19116))

* Upgrade to `actions/checkout@v3`
([#19112](#19112))

* Run the cherry pick script with `-x` for debugging
([#19095](#19095))

* Add more linux x86 test CI shards
([#19099](#19099))

* Use a trait for remote ByteStore network implementation
([#19050](#19050))

* Increase the logging of release version file publishing.
([#19092](#19092))

* Remove the Toolchain plugin
([#18978](#18978))

* Fix bad merge of #18829.
([#19080](#19080))

* Revert "Implement layout="zip" for Lambda/GCF, skipping lambdex"
([#19071](#19071))

* Remove unnecessary interpreter constraint config.
([#19065](#19065))

* Use hand-written change detection for PR/push job trimming
([#19045](#19045))

* Do not build wheels on push, since that is now accomplished by the
release job. ([#19063](#19063))

* Additional release job publishing fixes
([#19058](#19058))

* Change CI trigger to includelist `main` and `2.*.x`
([#19059](#19059))

* Release doc and script fixes
([#19043](#19043))

* Update cherry-picker to use `pull_request_target`
([#19048](#19048))

* Prepare `2.16.0rc3`.
([#19044](#19044))

* Prepare `2.15.1`.
([#19042](#19042))

* Fixup welcome-newcomers.yaml
([#19039](#19039))
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thejcannon thejcannon thejcannon approved these changes

@stuhood stuhood Awaiting requested review from stuhood

@benjyw benjyw Awaiting requested review from benjyw

Assignees
No one assigned
Labels
category:internal CI, fixes for not-yet-released features, etc.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Auto cherry-picker always errors with merge conflicts
3 participants
@huonw @stuhood @thejcannon