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

galaxy_collection folder #1933

Merged
merged 2 commits into from
Nov 27, 2023
Merged

galaxy_collection folder #1933

merged 2 commits into from
Nov 27, 2023

Conversation

Dule-martins
Copy link
Contributor

@Dule-martins Dule-martins commented Oct 12, 2023

What is this PR doing:

This PR resolves the issue with number #318 found in the ansible-community / community-team repo

Issue: AAH-2420

Reviewers must know:

PR Author & Reviewers: Keep or remove backport labels per Backporting Guidelines
Reviewers: Look for sound code, no code smells, docs & test coverage
Merger: When merging, include the Jira issue link in the squashed commit

@app-sre-bot
Copy link
Collaborator

Can one of the admins verify this patch?

@Dule-martins
Copy link
Contributor Author

@oraNod can you help with this, I would love to get this out of the way

@Dule-martins Dule-martins force-pushed the master branch 3 times, most recently from e000224 to 87ff29e Compare October 26, 2023 22:17
@samccann
Copy link
Contributor

@Dule-martins - thanks for your patience here as we work through an unfamiliar workflow. The CI is now failing because of :
ERROR: Missing change log entry for issue AAH-2420.

Looking at the Contributor guide It looks like we can avoid adding a changelog here if you amend the commit message to use Partial-Issue instead of Issue. Can you give that a try please? Remember the Partial-Issue has to be on its own line, separate from the rest of the commit message. I can't recall if you did this in the last commit or not? If not, I think the format is
git commit --amend -m "Galaxy collection folders" -m "Partial-Issue: AAH-2420"

@Dule-martins
Copy link
Contributor Author

Thank you @samccann I will take a look at it again and again until I succeed at it! Thanks for replying

Partial-Issue: AAH-2420
@Dule-martins
Copy link
Contributor Author

@Dule-martins - thanks for your patience here as we work through an unfamiliar workflow. The CI is now failing because of : ERROR: Missing change log entry for issue AAH-2420.

Looking at the Contributor guide It looks like we can avoid adding a changelog here if you amend the commit message to use Partial-Issue instead of Issue. Can you give that a try please? Remember the Partial-Issue has to be on its own line, separate from the rest of the commit message. I can't recall if you did this in the last commit or not? If not, I think the format is git commit --amend -m "Galaxy collection folders" -m "Partial-Issue: AAH-2420"

Hello @samccann As you can see I tried to follow your instructions but we still have a failed Galaxy CI. I went through the error log and found out that the ERROR: Missing change log entry for issue AAH-2420. and
Error: Process completed with exit code 1.

After going through the contributors' guide I noticed that a commit that references one or multiple issues must have a change log. In our case how can I identify the change log so I could add it to the commit message since that is what is missing?

@rochacbruno
Copy link
Member

HEy, either you put No-Issue in the commit message or please add a file on CHANGES/ directory

echo "add skeleton for galaxy_collection docs" > CHANGES/2420.doc

https://ansible.readthedocs.io/projects/galaxy-ng/en/latest/dev/getting_started/#submitting-a-pull-request

Issue: AAH-2420
@rochacbruno rochacbruno merged commit ca10b9f into ansible:master Nov 27, 2023
18 of 19 checks passed
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.

4 participants