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

Run tests also after merging #138

Closed
wants to merge 1 commit into from
Closed

Run tests also after merging #138

wants to merge 1 commit into from

Conversation

michaelosthege
Copy link
Collaborator

Previously tests did not run after merging.

This lead to incompatible changes being merged right after one another.

By running tests on main we will notice breaks earlier.

Other options would be to require every PR to rebase on main before merging. This is known as requiring linear history and can be changed in the project settings.

@michaelosthege michaelosthege added the refactoring / maintenance Cleaning, restructuring and related work label Oct 8, 2024
@michaelosthege michaelosthege self-assigned this Oct 8, 2024
@michaelosthege
Copy link
Collaborator Author

#135 broke the tests on main when it was merged.

@drbacke under https://github.com/Akkudoktor-EOS/EOS/settings/branches you can create a branch protection rule for main and make these settings to avoid introduction of bugs:

Protect matching branches

  • Require a pull request before merging
  • Require status checks to pass before merging

Rules applied to everyone including administrators

  • Allow force pushes
  • Allow deletions

@NormannK NormannK mentioned this pull request Oct 8, 2024
Previously tests did not run after merging.

This lead to incompatible changes being merged right after one another.

By running tests on main we will notice breaks earlier.

Other options would be to require every PR to rebase on main before merging.
This is known as requiring linear history and can be changed in the project settings.
@michaelosthege michaelosthege changed the title Run tests after merging Run tests also after merging Oct 9, 2024
@drbacke
Copy link
Collaborator

drbacke commented Oct 9, 2024

#135 broke the tests on main when it was merged.

@drbacke under https://github.com/Akkudoktor-EOS/EOS/settings/branches you can create a branch protection rule for main and make these settings to avoid introduction of bugs:

Protect matching branches

  • Require a pull request before merging
  • Require status checks to pass before merging

Rules applied to everyone including administrators

  • Allow force pushes
  • Allow deletions

Done😊 Good Idea👍

@michaelosthege
Copy link
Collaborator Author

replaced by #154

@michaelosthege
Copy link
Collaborator Author

@drbacke the branch rules appear to match the test-on-main branch too, preventing me from force-pushing or deleting it.
I moved the changes to a new PR #154. Please delete the test-on-main branch

@drbacke
Copy link
Collaborator

drbacke commented Oct 10, 2024

@michaelosthege maybe this is too restrictive. But the "Standard" rule doesnt seem to prevent force pushes. Maybe i've configured IT wrong

@NormannK NormannK deleted the test-on-main branch December 7, 2024 14:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
refactoring / maintenance Cleaning, restructuring and related work
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants