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

Add RELEASING.md with necessary instructions #246

Merged
merged 1 commit into from
Aug 20, 2024

Conversation

jajik
Copy link
Collaborator

@jajik jajik commented Jul 2, 2024

close #244

@jajik jajik requested review from jfclere and rhusar July 3, 2024 08:57
@jajik jajik marked this pull request as ready for review July 3, 2024 09:03
RELEASING.md Show resolved Hide resolved
RELEASING.md Outdated Show resolved Hide resolved
RELEASING.md Outdated Show resolved Hide resolved
@jajik jajik force-pushed the releasing branch 3 times, most recently from ca6e1d1 to e7c8696 Compare July 4, 2024 07:32
@jajik
Copy link
Collaborator Author

jajik commented Jul 4, 2024

@rhusar Looking at expected checks, we need to change the settings after #248

@rhusar
Copy link
Member

rhusar commented Jul 4, 2024

Thats funny, doesn't seem to be very well thought out. The only option is to remove all required checks which in turn disables other functionality..

@jajik
Copy link
Collaborator Author

jajik commented Jul 4, 2024

So it seems the workaround is this

laurencee/GithubActionTesting@876ef30

Seriously 😃

@rhusar
Copy link
Member

rhusar commented Jul 10, 2024

Thats funny, doesn't seem to be very well thought out. The only option is to remove all required checks which in turn disables other functionality..

Just for record, it disables this one:

Require branches to be up to date before merging
This ensures pull requests targeting a matching branch have been tested with the latest code. This setting will not take effect unless at least one status check is enabled (see below).

@jajik
Copy link
Collaborator Author

jajik commented Jul 10, 2024

Just for record, it disables this one:

Require branches to be up to date before merging
This ensures pull requests targeting a matching branch have been tested with the latest code. This setting will not take effect unless at least one status check is enabled (see below).

So you cannot enforce linear history without that?

@rhusar
Copy link
Member

rhusar commented Jul 10, 2024

Just for record, it disables this one:

Require branches to be up to date before merging
This ensures pull requests targeting a matching branch have been tested with the latest code. This setting will not take effect unless at least one status check is enabled (see below).

So you cannot enforce linear history without that?

I think you mean by 'linear history' changes being tested linearly / on top of each other and IIRC yes, this would remove the notification about branches not being up 2 date, which given we don't have a large turnover in this repo we want to keep.

I am thinking now let's go with your workaround.

@rhusar
Copy link
Member

rhusar commented Jul 10, 2024

Just for record, it disables this one:

Require branches to be up to date before merging
This ensures pull requests targeting a matching branch have been tested with the latest code. This setting will not take effect unless at least one status check is enabled (see below).

So you cannot enforce linear history without that?

I think you mean by 'linear history' changes being tested linearly / on top of each other and IIRC yes, this would remove the notification about branches not being up 2 date, which given we don't have a large turnover in this repo we want to keep.

I am thinking now let's go with your workaround.

OK merged - please rebase and see if this works.

@rhusar
Copy link
Member

rhusar commented Jul 10, 2024

Just for record, it disables this one:

Require branches to be up to date before merging
This ensures pull requests targeting a matching branch have been tested with the latest code. This setting will not take effect unless at least one status check is enabled (see below).

So you cannot enforce linear history without that?

I think you mean by 'linear history' changes being tested linearly / on top of each other and IIRC yes, this would remove the notification about branches not being up 2 date, which given we don't have a large turnover in this repo we want to keep.
I am thinking now let's go with your workaround.

OK merged - please rebase and see if this works.

OK thanks, the workaround looks good - and it's clear that the checks were indeed skipped.

RELEASING.md Show resolved Hide resolved
Copy link
Member

@rhusar rhusar left a comment

Choose a reason for hiding this comment

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

Looks good!

@rhusar rhusar merged commit 1216b3a into modcluster:main Aug 20, 2024
5 checks passed
@jajik jajik deleted the releasing branch October 14, 2024 07:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add RELEASING.md file with step-by-step instructions
3 participants