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

Prevent fix-up commits from being merged #543

Merged
merged 2 commits into from
Feb 25, 2025

Conversation

juliogonzalez
Copy link
Member

What does this PR change?

Prevent fix-up commits from being merged.

Port of uyuni-project/uyuni#9773 from the uyuni repository.

After this PR is merged, I will force the test to pass for the main branch.

Test coverage

  • No tests: None, this is adding an action

  • DONE

Links

Issue(s): None

  • DONE

Changelogs

Make sure the changelogs entries you are adding are compliant with https://github.com/uyuni-project/uyuni/wiki/Contributing#changelogs and https://github.com/uyuni-project/uyuni/wiki/Contributing#uyuni-projectuyuni-repository

If you don't need a changelog check, please mark this checkbox:

  • No changelog needed

If you uncheck the checkbox after the PR is created, you will need to re-run changelog_test (see below)

Before you merge

Check How to branch and merge properly!

@juliogonzalez juliogonzalez requested a review from cbosdo February 25, 2025 09:10
@juliogonzalez
Copy link
Member Author

Mmmmm, do I need to add a license to the file for the workflow :-?

@deneb-alpha
Copy link
Contributor

Mmmmm, do I need to add a license to the file for the workflow :-?

yes, please

The following files have no copyright and licensing information:
* .github/workflows/git-checks.yml

# SUMMARY

* Bad licenses: 0
* Deprecated licenses: 0
* Licenses without file extension: 0
* Missing licenses: 0
* Unused licenses: 0
* Used licenses: CC0-1.0, GPL-2.0-only, Apache-2.0
* Read errors: 0
* Files with copyright information: 402 / 403
* Files with license information: 402 / 403

Unfortunately, your project is not compliant with version 3.3 of the REUSE Specification :-(

@deneb-alpha
Copy link
Contributor

deneb-alpha commented Feb 25, 2025

and you should able to run REUSE locally before pushing.

Do you have the pre-commit hooks installed?

https://github.com/uyuni-project/uyuni-tools/blob/main/README.md#install-pre-commit-hooks

@juliogonzalez
Copy link
Member Author

https://github.com/uyuni-project/uyuni-tools/blob/main/README.md#install-pre-commit-hooks says:

Please install the hooks on your machine to enable them:
zypper in python3.XX-pre-commit
./install-hooks.sh

But I am using python 3.6 and the package doesn't exist on Leap 15.6? What else is missing? Do the instructions miss adding a repository?

@@ -0,0 +1,16 @@
# SPDX-FileCopyrightText: 2021 Bradley Erickson
#
# SPDX-License-Identifier: MIT
Copy link
Member Author

@juliogonzalez juliogonzalez Feb 25, 2025

Choose a reason for hiding this comment

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

The action and this configuration comes from https://github.com/13rac1/block-fixup-merge-action/blob/master/README.md, and that repo is license as MIT, and 13rac1 is Bradely Erickson, so this should be correct.

@deneb-alpha
Copy link
Contributor

deneb-alpha commented Feb 25, 2025

https://github.com/uyuni-project/uyuni-tools/blob/main/README.md#install-pre-commit-hooks says:

Please install the hooks on your machine to enable them:
zypper in python3.XX-pre-commit
./install-hooks.sh

But I am using python 3.6 and the package doesn't exist on Leap 15.6? What else is missing? Do the instructions miss adding a repository?

You're right...
I have the package built in my home, I forgot about this:

I'll see if it's possible to have it in Leap instead of using my custom repo. As alternative, we could build those packages in one of the Uyuni utils repos like tito etc

@juliogonzalez
Copy link
Member Author

https://github.com/uyuni-project/uyuni-tools/blob/main/README.md#install-pre-commit-hooks says:

Please install the hooks on your machine to enable them:
zypper in python3.XX-pre-commit
./install-hooks.sh

But I am using python 3.6 and the package doesn't exist on Leap 15.6? What else is missing? Do the instructions miss adding a repository?

I don't see this package using zypper ar https://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Stable:/ContainerUtils/openSUSE_Leap_Micro_5.5/ uyuni-container-utils either

In any case the PR tests are passing now.

Co-authored-by: Marina Latini <[email protected]>
Copy link
Contributor

@deneb-alpha deneb-alpha left a comment

Choose a reason for hiding this comment

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

LGTM, thanks

@juliogonzalez juliogonzalez merged commit a6848ad into uyuni-project:main Feb 25, 2025
10 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.

3 participants