Skip to content

Merge ormolu changes#106

Merged
brandonchinn178 merged 92 commits intofourmolu:masterfrom
brandonchinn178:merge-upstream
Sep 30, 2021
Merged

Merge ormolu changes#106
brandonchinn178 merged 92 commits intofourmolu:masterfrom
brandonchinn178:merge-upstream

Conversation

@brandonchinn178
Copy link
Copy Markdown
Collaborator

@brandonchinn178 brandonchinn178 commented Aug 10, 2021 •
edited
Loading

This merges in ormolu master as of today. This gets GHC 9 support, in addition to many other changes (this merges in 4 ormolu releases!)

Also adds DEVELOPER.md as a starting document for various developer workflows. Currently it has docs for the release process (feel free to edit as needed; i'm not sure how fourmolu was released in the past) and merging upstream ormolu changes

After-merge checklist

mrkkrp and others added 30 commits August 15, 2020 11:51
@mrkkrp
Allow ‘optparse-applicative-0.16’
d8c3e55
@zimbatm @mrkkrp
nix: allow to pass the system attribute
0b92af2 
This allows to build ormolu for another system as the machine's,
combined with Nix remote builders. It is also useful in a context of a
pure evaluation (like Flakes).
@mrkkrp
Update nix pin, test with GHC 8.8.4
54d36fc
@juhp @mrkkrp
readme: fix typo of "accommodate"
6a053ac 
[skip ci]
@SamirTalwar @mrkkrp
Avoid modifying correctly-formatted files
e95ec9b 
Currently, when running with `--mode=inplace`, Ormolu always overwrites the
files, even when nothing has changed, updating the modified timestamp of the
file. This encourages Stack to rebuild everything when only one file has
changed.

A quick check to see if the file needs rewriting solves this problem.

I would prefer the API allowed me to only read the file once, but as the
`--mode=check` logic also reads the file twice, I decided this wasn't the
biggest sin for now.
@amesgen @mrkkrp
add workflow for release binaries
dec158c 
see e.g. https://stackoverflow.com/a/61066906 for why `published` is
used as the release trigger
@tomjaguarpaw @mrkkrp
Fix grammar
139df24
@tomjaguarpaw @mrkkrp
Clarify enabling/disabling
6ced0eb
@mrkkrp
Guarantee a space before ticked promoted types
a38b009
@mrkkrp
Make single-line explicit bidirectional pattern synonyms idempotent
c883856
@mrkkrp
Version bump (0.1.3.0)
3f6b60a
@mrkkrp
Fix a typo in the changelog
5f7eb9d
@felixonmars @mrkkrp
Allow path 0.8
5a5a234 
Builds fine and all tests pass here.
@mrkkrp
Update nix pin, test with GHC 8.10.2
f896262
@mrkkrp
Fix multiline record dot updates with the record dot plugin
6473559
@mrkkrp
Version bump (0.1.3.1)
a28f7b8
@sellout @mrkkrp
Add support for monad comprehensions
288e1cc
@mrkkrp
Avoid inserting a redundant space in front of ticked types
286afb7 
In certain cases spaces in this position are unnecessary. Here we try to
make the algorithm smarter so that it doesn't always insert spaces.
@mrkkrp
Display diffs in the checking mode
93bef50 
Also improve the way the diffs are printed.
@mrkkrp
Add explanations for the exit codes to the readme
90a894e
@mrkkrp
Add table of contents to the readme, rearrange sections
4d85d70
@mrkkrp
Misc edits in the readme
8dc40b5
@mrkkrp
Version bump (0.1.4.0)
84b6a60
@neongreen @mrkkrp
Fix issue links in the changelog
703069d
@mrkkrp
Add ‘--color’ for controlling how diffs are printed
ff9d64d 
Also refactor the printing code and standardize how error messages are
output.
@mrkkrp
Version bump (0.1.4.1)
7714b52
@mrkkrp
Mention the ormolu-action in the readme
9cad22a
@mrkkrp
Simplify the definition of ‘optParserInfo’
a63ded8
@amesgen @mrkkrp
update CI for release binaries
dc14e94
@mrkkrp
Test with GHC 8.10.3
4e01690
georgefst
georgefst reviewed Sep 28, 2021
View reviewed changes
georgefst
georgefst reviewed Sep 28, 2021
View reviewed changes
georgefst
georgefst reviewed Sep 28, 2021
View reviewed changes
@georgefst
Copy link
Copy Markdown
Collaborator

georgefst commented Sep 28, 2021

Also, what do you think about making the CI jobs required for merges into master?

Seems like a good idea. But I don't care that much either if it isn't trivial to set up - it's easy enough to just avoid merging.

@georgefst
Copy link
Copy Markdown
Collaborator

georgefst commented Sep 28, 2021

Great stuff. Thanks for doing this. And apologies for forgetting to use GitHub's review feature to bundle up my comments with...

This is now blocked on: tweag/ormolu#474

I think we ought to just push ahead. Or we could be waiting a while. We can add a note in the changelog about the regression, and mention that it will be fixed again as soon as GHC 9.2 is out.

@brandonchinn178
Copy link
Copy Markdown
Collaborator Author

brandonchinn178 commented Sep 28, 2021

Seems like a good idea. But I don't care that much either if it isn't trivial to set up - it's easy enough to just avoid merging.

It's pretty trivial.

  1. Go to Settings > Branches > Branch protection rules > Add rule
  2. Branch name pattern = master
  3. Check "Require status checks to pass before merging"
  4. Check all of the circle ci jobs to block merges

This will force all commits merging into master to pass CI. It also prevents force pushes to master and effectively prevents committing to master (since a commit needs status checks to pass to go to master).

This is now blocked on: tweag/ormolu#474

I think we ought to just push ahead. Or we could be waiting a while. We can add a note in the changelog about the regression, and mention that it will be fixed again as soon as GHC 9.2 is out.

Yeah, you're right.

@georgefst
Copy link
Copy Markdown
Collaborator

georgefst commented Sep 28, 2021 •
edited
Loading

I don't appear to have the permissions to access the repository settings:

image

@parsonsmatt?

This was linked to issues Sep 28, 2021
The readme/documentation could mention how changes are pulled from ormolu #92
Closed
GHC 9.0 Compatibility: TypeApplications and ticked promoted constructors #57
Closed
brandonchinn178
brandonchinn178 commented Sep 29, 2021
View reviewed changes
@brandonchinn178
Copy link
Copy Markdown
Collaborator Author

brandonchinn178 commented Sep 29, 2021

@georgefst is this waiting on anything before merge?

@brprice brprice mentioned this pull request Sep 29, 2021
Open
@georgefst
Copy link
Copy Markdown
Collaborator

georgefst commented Sep 29, 2021

@georgefst is this waiting on anything before merge?

Nope, looks good!

@brandonchinn178 brandonchinn178 merged commit 4f40026 into fourmolu:master Sep 30, 2021
@brandonchinn178 brandonchinn178 deleted the merge-upstream branch September 30, 2021 01:18
@parsonsmatt
Copy link
Copy Markdown
Collaborator

parsonsmatt commented Oct 1, 2021

I don't appear to have the permissions to access the repository settings:

image

@parsonsmatt?

I've made you an owner on the organization

@brandonchinn178 brandonchinn178 mentioned this pull request Oct 3, 2021
Closed
@georgefst
Copy link
Copy Markdown
Collaborator

georgefst commented Oct 3, 2021

I don't appear to have the permissions to access the repository settings:
image
@parsonsmatt?

I've made you an owner on the organization

Thanks!

@georgefst
Copy link
Copy Markdown
Collaborator

georgefst commented Oct 3, 2021

It's pretty trivial.

1. Go to Settings > Branches > Branch protection rules > Add rule

2. Branch name pattern = `master`

3. Check "Require status checks to pass before merging"

4. Check all of the circle ci jobs to block merges

Done.

@georgefst georgefst mentioned this pull request Oct 30, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@georgefst georgefst georgefst approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

The readme/documentation could mention how changes are pulled from ormolu GHC 9.0 Compatibility: TypeApplications and ticked promoted constructors