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.

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

Don't test docs on release branches #997

Merged
merged 1 commit into from
Jun 21, 2024
Merged

Conversation

mdellweg
Copy link
Member

Review Checklist:

  • An issue is properly linked. [feature and bugfix only]
  • Tests are present or not feasible.
  • Commits are split in a logical way (not historically).

@mdellweg mdellweg marked this pull request as ready for review June 21, 2024 12:20
@mdellweg mdellweg enabled auto-merge (rebase) June 21, 2024 15:01
@mdellweg mdellweg merged commit 4774b67 into pulp:main Jun 21, 2024
22 checks passed
@mdellweg mdellweg deleted the update_pulpcore branch June 21, 2024 15:16
Copy link

patchback bot commented Jun 21, 2024

Backport to 0.25: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 4774b67 on top of patchback/backports/0.25/4774b6717fcaadd3d46744800e8ddc510faddaae/pr-997

Backporting merged PR #997 into main

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/pulp/pulp-cli.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/0.25/4774b6717fcaadd3d46744800e8ddc510faddaae/pr-997 upstream/0.25
  4. Now, cherry-pick PR Don't test docs on release branches #997 contents into that branch:
    $ git cherry-pick -x 4774b6717fcaadd3d46744800e8ddc510faddaae
    If it'll yell at you with something like fatal: Commit 4774b6717fcaadd3d46744800e8ddc510faddaae is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 4774b6717fcaadd3d46744800e8ddc510faddaae
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Don't test docs on release branches #997 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/0.25/4774b6717fcaadd3d46744800e8ddc510faddaae/pr-997
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants