Skip to content

Conversation

@hunleyd
Copy link
Collaborator

@hunleyd hunleyd commented Jul 29, 2025

Implement the pipeline changes specified in #870

closes #870

Signed-off-by: Douglas J Hunley <doug.hunley@gmail.com>
@hunleyd
Copy link
Collaborator Author

hunleyd commented Jul 29, 2025

@Andersson007 pls lmk if you would prefer those is search() converted to | regex_search() or not

@Andersson007 Andersson007 merged commit 9eb794e into ansible-collections:main Jul 30, 2025
30 checks passed
@Andersson007 Andersson007 added the backport-3 Put it on PR to backport to stable-3 (only bug/doc fixes) label Jul 30, 2025
@patchback
Copy link

patchback bot commented Jul 30, 2025

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

❌ Failed to cleanly apply 9eb794e on top of patchback/backports/stable-3/9eb794eb178f07ba0fbf2992988c51b1f59a1dae/pr-871

Backporting merged PR #871 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.postgresql.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-3/9eb794eb178f07ba0fbf2992988c51b1f59a1dae/pr-871 upstream/stable-3
  4. Now, cherry-pick PR ci(azure): update the azure pipeline; closes #870 #871 contents into that branch:
    $ git cherry-pick -x 9eb794eb178f07ba0fbf2992988c51b1f59a1dae
    If it'll yell at you with something like fatal: Commit 9eb794eb178f07ba0fbf2992988c51b1f59a1dae is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 9eb794eb178f07ba0fbf2992988c51b1f59a1dae
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR ci(azure): update the azure pipeline; closes #870 #871 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-3/9eb794eb178f07ba0fbf2992988c51b1f59a1dae/pr-871
  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.

@Andersson007
Copy link
Collaborator

@hunleyd I have no preference. Anyway, thanks for the contribution! @andreasscherbaum thanks for reviewing!

Andersson007 pushed a commit to Andersson007/community.postgresql that referenced this pull request Jul 30, 2025
…nsible-collections#871)

* ci(azure): update the azure pipeline; closes ansible-collections#870

Signed-off-by: Douglas J Hunley <doug.hunley@gmail.com>

* fix(ci): only update Azure for devel, duh

* fix(test): look for the binary, not the path of the binary

---------

Signed-off-by: Douglas J Hunley <doug.hunley@gmail.com>
(cherry picked from commit 9eb794e)
Andersson007 added a commit that referenced this pull request Jul 31, 2025
* ci(azure): update the azure pipeline; closes #870



* fix(ci): only update Azure for devel, duh

* fix(test): look for the binary, not the path of the binary

---------


(cherry picked from commit 9eb794e)

Signed-off-by: Douglas J Hunley <doug.hunley@gmail.com>
Co-authored-by: Douglas J Hunley <doug.hunley@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-3 Put it on PR to backport to stable-3 (only bug/doc fixes)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Check the forum post about distro images changes and update the CI matrix if needed

3 participants