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

Hls 2.0.0.1 forward port #3680

Merged
merged 11 commits into from
Jun 30, 2023
Merged

Hls 2.0.0.1 forward port #3680

merged 11 commits into from
Jun 30, 2023

Conversation

hasufell
Copy link
Member

No description provided.

@hasufell hasufell requested review from wz1000 and fendor June 28, 2023 13:04
@hasufell hasufell self-assigned this Jun 28, 2023
@hasufell hasufell mentioned this pull request Jun 28, 2023
Closed
17 tasks
fendor
fendor reviewed Jun 28, 2023
View reviewed changes
RELEASING.md
Comment on lines +1 to +3
# Releasing

## Release checklist
Copy link
Collaborator

Choose a reason for hiding this comment

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

I love this addition!

This has a big overlap with https://github.com/haskell/haskell-language-server/blob/master/docs/contributing/releases.md, we should probably merge these documents.

Copy link
Member Author

Choose a reason for hiding this comment

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

Possibly... but the other document is old and I've never looked at it.

My suggestion is to have another contributor do a release while I'm available and ask questions when anything in the checklist is unclear... and then we can add more information as we go.

Copy link
Collaborator

Choose a reason for hiding this comment

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

An acceptable merge operation is "discard the old one" :)

Copy link
Collaborator

Choose a reason for hiding this comment

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

The old list is at least partially up-to-date and contains a lot of detailed information, I would not just delete it.

@fendor fendor enabled auto-merge (rebase) June 28, 2023 13:52
fendor
fendor approved these changes Jun 28, 2023
View reviewed changes
Copy link
Collaborator

@fendor fendor left a comment

Choose a reason for hiding this comment

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

LGTM, since this just syncs up the release branch with master.

Comments need to be addressed in follow-up PRs.

@hasufell hasufell force-pushed the hls-2.0.0.1-forward-port branch from 0792216 to 625608e Compare June 29, 2023 10:40
@hasufell
Copy link
Member Author

who keeps pushing to master?

@hasufell hasufell force-pushed the hls-2.0.0.1-forward-port branch from 625608e to 5d6744a Compare June 30, 2023 09:58
@hasufell hasufell requested a review from michaelpj June 30, 2023 09:59
@michaelpj
Copy link
Collaborator

It's called PR's getting merged ;)

@michaelpj michaelpj added the merge me Label to trigger pull request merge label Jun 30, 2023
@fendor fendor merged commit 90b18ee into haskell:master Jun 30, 2023
@fendor fendor mentioned this pull request Aug 8, 2023
Merged
19 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fendor fendor fendor approved these changes

@michaelpj michaelpj Awaiting requested review from michaelpj michaelpj is a code owner

Assignees

@hasufell hasufell

Labels
merge me Label to trigger pull request merge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@hasufell @michaelpj @fendor