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

[docker compose CI] standalone profile #2382

Merged

Conversation

jerabekjiri
Copy link
Contributor

Issue: AAP-36976

Copy link

sonarcloud bot commented Dec 6, 2024

@rochacbruno rochacbruno merged commit 506ac9d into ansible:master Dec 12, 2024
19 of 22 checks passed
Copy link

patchback bot commented Dec 12, 2024

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

❌ Failed to cleanly apply 506ac9d on top of patchback/backports/stable-4.10/506ac9dbf70d69a5639de18416c063c3a4d857a8/pr-2382

Backporting merged PR #2382 into master

  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/galaxy_ng.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-4.10/506ac9dbf70d69a5639de18416c063c3a4d857a8/pr-2382 upstream/stable-4.10
  4. Now, cherry-pick PR [docker compose CI] standalone profile #2382 contents into that branch:
    $ git cherry-pick -x 506ac9dbf70d69a5639de18416c063c3a4d857a8
    If it'll yell at you with something like fatal: Commit 506ac9dbf70d69a5639de18416c063c3a4d857a8 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 506ac9dbf70d69a5639de18416c063c3a4d857a8
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR [docker compose CI] standalone profile #2382 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-4.10/506ac9dbf70d69a5639de18416c063c3a4d857a8/pr-2382
  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.

jerabekjiri added a commit to jerabekjiri/galaxy_ng that referenced this pull request Dec 16, 2024
* init standalone profile with docker compose CI

(cherry picked from commit 506ac9d)
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