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

Add stable-2.14 to CI, adjust to devel version bump #5298

Merged
merged 2 commits into from
Sep 21, 2022
Merged

Add stable-2.14 to CI, adjust to devel version bump #5298

merged 2 commits into from
Sep 21, 2022

Conversation

felixfontein
Copy link
Collaborator

SUMMARY

stable-2.14 has been branched.

ISSUE TYPE
  • Test Pull Request
COMPONENT NAME

CI

@ansibullbot ansibullbot added the tests tests label Sep 20, 2022
@felixfontein
Copy link
Collaborator Author

Before: 138 checks
After: 142 checks

@felixfontein felixfontein merged commit a938c9d into ansible-collections:main Sep 21, 2022
@patchback
Copy link

patchback bot commented Sep 21, 2022 •
edited
Loading

Backport to stable-5: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply a938c9d on top of patchback/backports/stable-5/a938c9de655823cac39328c1ecfb4a2651212d37/pr-5298

Backporting merged PR #5298 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/ansible-collections/community.general.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/stable-5/a938c9de655823cac39328c1ecfb4a2651212d37/pr-5298 upstream/stable-5
  4. Now, cherry-pick PR Add stable-2.14 to CI, adjust to devel version bump #5298 contents into that branch: 
    $ git cherry-pick -x a938c9de655823cac39328c1ecfb4a2651212d37
    If it'll yell at you with something like fatal: Commit a938c9de655823cac39328c1ecfb4a2651212d37 is a merge but no -m option was given., add -m 1 as follows intead: 
    $ git cherry-pick -m1 -x a938c9de655823cac39328c1ecfb4a2651212d37
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Add stable-2.14 to CI, adjust to devel version bump #5298 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub: 
    $ git push origin patchback/backports/stable-5/a938c9de655823cac39328c1ecfb4a2651212d37/pr-5298
  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.

@felixfontein felixfontein deleted the add-stable-2.14 branch September 21, 2022 05:58
felixfontein added a commit to felixfontein/community.general that referenced this pull request Sep 21, 2022
@felixfontein
Add stable-2.14 to CI, adjust to devel version bump (ansible-collecti…
2fe8d50 
…ons#5298)

* Add stable-2.14 to CI, adjust to devel version bump.

* Thin out matrix a bit.

(cherry picked from commit a938c9d)
@felixfontein felixfontein mentioned this pull request Sep 21, 2022
Merged
@felixfontein
Copy link
Collaborator Author

Manual backport to stable-5 in #5300.

felixfontein added a commit that referenced this pull request Sep 21, 2022
@felixfontein
Add stable-2.14 to CI, adjust to devel version bump (#5298) (#5300)
baec510 
* Add stable-2.14 to CI, adjust to devel version bump.

* Thin out matrix a bit.

(cherry picked from commit a938c9d)
v1v added a commit to v1v/community.general that referenced this pull request Oct 7, 2022
@v1v
Merge remote-tracking branch 'upstream/main' into feature/support-logs
3d0c09d 
* upstream/main: (203 commits)
  Make pfexec become usable for illumos (ansible-collections#3889)
  znode: add options for authentication (ansible-collections#5306)
  keycloak_user_federation: add explanation and example to vendor option (ansible-collections#4893)
  Next expected release is 5.8.0.
  Allow terraform module to specify complex variable structures (ansible-collections#4797)
  Fix ansible-collections#5313: redhat_subscription module is not idempotent when pool_ids (ansible-collections#5319)
  bitwarden: Add field to search for all item attributes, instead of on… (ansible-collections#5297)
  New Module: Keycloak User Rolemapping (ansible-collections#4898)
  chore: Update lxc_container to support py3 (ansible-collections#5304)
  terraform: run `init` with no-color, too (ansible-collections#5147)
  nmcli: fix error when setting previously unset mac address (ansible-collections#5291)
  [feat] proxmox_snap: snapshot containers with configured mountpoints (ansible-collections#5274)
  machinectl: include the success command (ansible-collections#5287)
  Add SetSessionService to redfish_config (ansible-collections#5009)
  locale_gen: fix UbuntuMode (ansible-collections#5282)
  ini_file: fix lint error (ansible-collections#5307)
  netcup_dnsapi: Add timeout paramter (ansible-collections#5301)
  stable-2.14 is now default.
  Add stable-2.14 to CI, adjust to devel version bump (ansible-collections#5298)
  Try to run reuse workflow without explicitly allowing it for new contributors. (ansible-collections#5296)
  ...
bratwurzt pushed a commit to bratwurzt/community.general that referenced this pull request Nov 7, 2022
@felixfontein
Add stable-2.14 to CI, adjust to devel version bump (ansible-collecti…
db9c4c4 
…ons#5298)

* Add stable-2.14 to CI, adjust to devel version bump.

* Thin out matrix a bit.
bratwurzt pushed a commit to bratwurzt/community.general that referenced this pull request Nov 7, 2022
@felixfontein
Add stable-2.14 to CI, adjust to devel version bump (ansible-collecti…
6b60128 
…ons#5298)

* Add stable-2.14 to CI, adjust to devel version bump.

* Thin out matrix a bit.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
tests tests
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@felixfontein @ansibullbot