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 black and github workflow rework #1499

Merged
merged 5 commits into from
May 23, 2023
Merged

Add black and github workflow rework #1499

merged 5 commits into from
May 23, 2023

Conversation

alinabuzachis
Copy link
Collaborator

SUMMARY

Add black and github workflow rework

ISSUE TYPE
  • Bugfix Pull Request
  • Docs Pull Request
  • Feature Pull Request
  • New Module Pull Request
COMPONENT NAME
ADDITIONAL INFORMATION

@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.
https://ansible.softwarefactory-project.io/zuul/buildset/12b622463a4742d38309740b5a768700

✔️ ansible-galaxy-importer SUCCESS in 3m 57s
✔️ build-ansible-collection SUCCESS in 12m 47s

GomathiselviS
GomathiselviS reviewed May 2, 2023
View reviewed changes
.github/workflows/black.yml Outdated
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The linters job in changelog_and linters.yml will take care of 'black' check if 'black' is added to tox.ini. I do not think a separate workflow is needed.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

black should be run against main only, so I removed black from top and re-added the workflow for black.

Copy link
Contributor

@tremble tremble May 3, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tox might be the better option here. We can add it to main's tox and as long as we don't backport the tox update then we'll only apply this style change to 6.0.0 and later. (tox will run using the tox.ini from the branch being tested)

@softwarefactory-project-zuul
Copy link
Contributor

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.
Warning:
Error merging github.com/ansible-collections/amazon.aws for 1499,dd77c91dc9ec16c816cb7d05bc0b6517c3b7b1d6

@alinabuzachis alinabuzachis force-pushed the back_and_workflow_rework branch 11 times, most recently from f0af9b5 to 89c6763 Compare May 2, 2023 18:20
@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.
https://ansible.softwarefactory-project.io/zuul/buildset/bfb5cea220754d1eab6e9c859f4bec2c

✔️ ansible-galaxy-importer SUCCESS in 4m 17s
✔️ build-ansible-collection SUCCESS in 13m 32s

This was referenced May 4, 2023
Merged
Merged
@alinabuzachis
Add black and github workflow rework
9cbbe36 
Signed-off-by: Alina Buzachis <[email protected]>
@alinabuzachis
Run black on main only
734472c 
Signed-off-by: Alina Buzachis <[email protected]>
@alinabuzachis
Remove black workflow
cc1708d 
Signed-off-by: Alina Buzachis <[email protected]>
@alinabuzachis alinabuzachis force-pushed the back_and_workflow_rework branch from 89c6763 to cc1708d Compare May 16, 2023 14:45
tremble
tremble reviewed May 16, 2023
View reviewed changes
Copy link
Contributor

@tremble tremble left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does tests.yml need to be removed? This looks like the unit/sanity tests are duplicated now

@alinabuzachis
remove tests.yml
ea09406 
Signed-off-by: Alina Buzachis <[email protected]>
@alinabuzachis
Copy link
Collaborator Author

Does tests.yml need to be removed? This looks like the unit/sanity tests are duplicated now

Yes, thanks!

@alinabuzachis
Update references
6944c18 
Signed-off-by: Alina Buzachis <[email protected]>
@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.
https://ansible.softwarefactory-project.io/zuul/buildset/8f67479dc7c348c5b8fd8f1f4517d23d

✔️ ansible-galaxy-importer SUCCESS in 3m 36s
✔️ build-ansible-collection SUCCESS in 12m 48s

@alinabuzachis alinabuzachis requested a review from tremble May 16, 2023 16:21
@alinabuzachis alinabuzachis added the mergeit Merge the PR (SoftwareFactory) label May 23, 2023
@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded (gate pipeline).
https://ansible.softwarefactory-project.io/zuul/buildset/d9626b87475f4b8eb2bc160f51c53406

✔️ ansible-galaxy-importer SUCCESS in 3m 59s
✔️ build-ansible-collection SUCCESS in 13m 18s

@softwarefactory-project-zuul
Copy link
Contributor

Pull request merge failed: Resource not accessible by integration, You may need to manually rebase your PR and retry.

@tremble tremble merged commit 9b65de3 into ansible-collections:main May 23, 2023
@github-actions
Copy link

Docs Build 📝

Thank you for contribution!✨

This PR has been merged and your docs changes will be incorporated when they are next published.

alinabuzachis added a commit to alinabuzachis/amazon.aws that referenced this pull request Jul 4, 2023
@alinabuzachis
Add black and github workflow rework (ansible-collections#1499)
af44c9b 
Manually merged (.github/)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GomathiselviS GomathiselviS GomathiselviS approved these changes

@tremble tremble Awaiting requested review from tremble

Assignees
No one assigned
Labels
mergeit Merge the PR (SoftwareFactory)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@alinabuzachis @tremble @GomathiselviS