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

Add release automation #718

Merged
merged 1 commit into from
Jul 19, 2023
Merged

Add release automation #718

merged 1 commit into from
Jul 19, 2023

Conversation

mdellweg
Copy link
Member

@mdellweg mdellweg commented Jul 13, 2023

  • Create release branch from main and bump minor version
  • Release from a release branch and bump patch version

[noissue]

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 force-pushed the release_workflow branch 25 times, most recently from 6e0d511 to 1410412 Compare July 17, 2023 16:48
@mdellweg mdellweg marked this pull request as ready for review July 17, 2023 16:48
@mdellweg mdellweg changed the title WIP: Add release automation Add release automation Jul 17, 2023
@mdellweg mdellweg force-pushed the release_workflow branch 3 times, most recently from 5066608 to 7d5379a Compare July 18, 2023 07:59
@mdellweg mdellweg force-pushed the release_workflow branch 2 times, most recently from 79a6b18 to 3915196 Compare July 18, 2023 08:02
Copy link
Contributor

@ggainey ggainey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Automation is good - let's see how it flies in practice!

* Create release branch from main and bump minor version
* Release from a release branch and bump patch version

[noissue]
@mdellweg mdellweg merged commit b138270 into pulp:main Jul 19, 2023
12 checks passed
@mdellweg mdellweg deleted the release_workflow branch July 19, 2023 06:58
@pulp pulp deleted a comment from patchback bot Jul 19, 2023
@patchback
Copy link

patchback bot commented Jul 19, 2023

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

❌ Failed to cleanly apply b138270 on top of patchback/backports/0.20/b138270d9085394aa7f1cd751fb0a7ddf2c0bcaa/pr-718

Backporting merged PR #718 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.20/b138270d9085394aa7f1cd751fb0a7ddf2c0bcaa/pr-718 upstream/0.20
  4. Now, cherry-pick PR Add release automation #718 contents into that branch:
    $ git cherry-pick -x b138270d9085394aa7f1cd751fb0a7ddf2c0bcaa
    If it'll yell at you with something like fatal: Commit b138270d9085394aa7f1cd751fb0a7ddf2c0bcaa is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x b138270d9085394aa7f1cd751fb0a7ddf2c0bcaa
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Add release automation #718 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/0.20/b138270d9085394aa7f1cd751fb0a7ddf2c0bcaa/pr-718
  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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants