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

Fix publishing collection to specified repository when content approval is set to false #1717

Merged
merged 6 commits into from
Jun 13, 2023

Conversation

jerabekjiri
Copy link
Contributor

Issue: AAH-2328

@netlify
Copy link

netlify bot commented May 10, 2023

Deploy Preview for galaxyng ready!

Name Link
🔨 Latest commit 4a10aff
🔍 Latest deploy log https://app.netlify.com/sites/galaxyng/deploys/6482ff1b7f36de0008b0ecfd
😎 Deploy Preview https://deploy-preview-1717--galaxyng.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

@github-actions github-actions bot added backport-4.2 This PR should be backported to stable-4.2 (1.2) backport-4.4 This PR should be backported to stable-4.4 (2.1) backport-4.5 This PR should be backported to stable-4.5 (2.2) backport-4.6 This PR should be backported to stable-4.6 (2.3) backport-4.7 This PR should be backported to stable-4.7 (2.4) labels May 10, 2023
@jerabekjiri jerabekjiri removed backport-4.2 This PR should be backported to stable-4.2 (1.2) backport-4.4 This PR should be backported to stable-4.4 (2.1) backport-4.5 This PR should be backported to stable-4.5 (2.2) backport-4.6 This PR should be backported to stable-4.6 (2.3) labels May 11, 2023
@jctanner
Copy link
Collaborator

@jerabekjiri this is a bugfix right, not a new feature?

We should probably add a collection publish test in https://github.com/ansible/galaxy_ng/blob/master/galaxy_ng/tests/integration/cli/test_community.py with the community decorator so that we have coverage with approvals off.

@jerabekjiri
Copy link
Contributor Author

@jctanner Good idea, we have integration tests with auto_approval, but they get skipped in CI. So if the community decorator runs with the approval off, I can add it there.

@jerabekjiri jerabekjiri force-pushed the fix/a-g-collection-publish branch 3 times, most recently from 1d95c7a to 3e125ce Compare May 23, 2023 16:49
@jerabekjiri jerabekjiri force-pushed the fix/a-g-collection-publish branch 4 times, most recently from 5c6eafe to d1da13b Compare May 25, 2023 12:34
@newswangerd newswangerd merged commit a11b827 into ansible:master Jun 13, 2023
@patchback
Copy link

patchback bot commented Jun 13, 2023

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

❌ Failed to cleanly apply a11b827 on top of patchback/backports/stable-4.7/a11b827c3e35ae70ee9b2e8d82ee0d2a1602f72d/pr-1717

Backporting merged PR #1717 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.7/a11b827c3e35ae70ee9b2e8d82ee0d2a1602f72d/pr-1717 upstream/stable-4.7
  4. Now, cherry-pick PR Fix publishing collection to specified repository when content approval is set to false #1717 contents into that branch:
    $ git cherry-pick -x a11b827c3e35ae70ee9b2e8d82ee0d2a1602f72d
    If it'll yell at you with something like fatal: Commit a11b827c3e35ae70ee9b2e8d82ee0d2a1602f72d is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x a11b827c3e35ae70ee9b2e8d82ee0d2a1602f72d
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Fix publishing collection to specified repository when content approval is set to false #1717 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-4.7/a11b827c3e35ae70ee9b2e8d82ee0d2a1602f72d/pr-1717
  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.

EamonTracey pushed a commit to EamonTracey/galaxy_ng that referenced this pull request Jun 23, 2023
…al is set to false (ansible#1717)

* fix publishing collection with ansible-galaxy

Issue: AAH-2328
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-4.7 This PR should be backported to stable-4.7 (2.4)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants