Skip to content

Use treefmt for running cabal-fmt #3785

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

Merged
akshaymankar merged 4 commits into from
Dec 20, 2023
Merged

Use treefmt for running cabal-fmt #3785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0b4bbdb
Use treefmt for running cabal-fmt
akshaymankar Dec 18, 2023
7eaad95
Makefile: Make lint-all fail when treefmt changes anything
akshaymankar Dec 18, 2023
753e3d2
GH Actions: Remove treefmt
akshaymankar Dec 18, 2023
14a5b15
cabal-fmt everything
akshaymankar Dec 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,6 @@ on:
branches: [master, develop]

jobs:
treefmt:
name: Run treefmt
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
submodules: true
- uses: cachix/install-nix-action@v20
- uses: cachix/cachix-action@v12
with:
name: wire-server
signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
- name: Install treefmt and nixpkgs-fmt (without pulling in all of dev-env)
run: nix-env -if nix/default.nix -iA pkgs.treefmt pkgs.nixpkgs-fmt pkgs.shellcheck
- name: Run treefmt
run: treefmt

build-docs:
name: Build docs
runs-on: ubuntu-latest
Expand Down
14 changes: 7 additions & 7 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ cabal.project.local:

# Usage: make c package=brig test=1
.PHONY: c
c: cabal-fmt
c: treefmt
cabal build $(WIRE_CABAL_BUILD_OPTIONS) $(package) || ( make clean-hint; false )
ifeq ($(test), 1)
./hack/bin/cabal-run-tests.sh $(package) $(testargs)
Expand Down Expand Up @@ -141,13 +141,9 @@ list-flaky-tests:
@git grep -Hne '\bflakyTestCase \"'
@git grep -Hne '[^^]\bflakyTest\b'

.PHONY: cabal-fmt
cabal-fmt:
./hack/bin/cabal-fmt.sh $(package)

# Get a ghci environment running for the given package.
.PHONY: repl
repl: cabal-fmt
repl: treefmt
cabal repl $(WIRE_CABAL_BUILD_OPTIONS) $(package)

# Use ghcid to watch a particular package.
Expand All @@ -158,7 +154,7 @@ ghcid:

# Used by CI
.PHONY: lint-all
lint-all: formatc hlint-check-all check-local-nix-derivations treefmt
lint-all: formatc hlint-check-all check-local-nix-derivations treefmt-check

.PHONY: hlint-check-all
hlint-check-all:
Expand Down Expand Up @@ -229,6 +225,10 @@ add-license:
treefmt:
treefmt

.PHONY: treefmt-check
treefmt-check:
treefmt --fail-on-change

#################################
## docker targets

Expand Down
51 changes: 0 additions & 51 deletions hack/bin/cabal-fmt.sh
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion integration/integration.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ common common-all
-Wall -Wpartial-fields -fwarn-tabs -Wno-incomplete-uni-patterns

default-extensions:
NoImplicitPrelude
AllowAmbiguousTypes
BangPatterns
BlockArguments
Expand All @@ -50,6 +49,7 @@ common common-all
MultiParamTypeClasses
MultiWayIf
NamedFieldPuns
NoImplicitPrelude
OverloadedLabels
OverloadedRecordDot
PackageImports
Expand Down
2 changes: 1 addition & 1 deletion libs/bilge/bilge.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ library
other-modules: Paths_bilge
hs-source-dirs: src
default-extensions:
NoImplicitPrelude
AllowAmbiguousTypes
BangPatterns
ConstraintKinds
Expand All @@ -53,6 +52,7 @@ library
MultiParamTypeClasses
MultiWayIf
NamedFieldPuns
NoImplicitPrelude
OverloadedRecordDot
OverloadedStrings
PackageImports
Expand Down
4 changes: 2 additions & 2 deletions libs/brig-types/brig-types.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ library
other-modules: Paths_brig_types
hs-source-dirs: src
default-extensions:
NoImplicitPrelude
AllowAmbiguousTypes
BangPatterns
ConstraintKinds
Expand All @@ -52,6 +51,7 @@ library
MultiParamTypeClasses
MultiWayIf
NamedFieldPuns
NoImplicitPrelude
OverloadedRecordDot
OverloadedStrings
PackageImports
Expand Down Expand Up @@ -103,7 +103,6 @@ test-suite brig-types-tests

hs-source-dirs: test/unit
default-extensions:
NoImplicitPrelude
AllowAmbiguousTypes
BangPatterns
ConstraintKinds
Expand All @@ -127,6 +126,7 @@ test-suite brig-types-tests
MultiParamTypeClasses
MultiWayIf
NamedFieldPuns
NoImplicitPrelude
OverloadedRecordDot
OverloadedStrings
PackageImports
Expand Down
2 changes: 1 addition & 1 deletion libs/cargohold-types/cargohold-types.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ library
other-modules: Paths_cargohold_types
hs-source-dirs: src
default-extensions:
NoImplicitPrelude
AllowAmbiguousTypes
BangPatterns
ConstraintKinds
Expand All @@ -42,6 +41,7 @@ library
MultiParamTypeClasses
MultiWayIf
NamedFieldPuns
NoImplicitPrelude
OverloadedRecordDot
OverloadedStrings
PackageImports
Expand Down
2 changes: 1 addition & 1 deletion libs/cassandra-util/cassandra-util.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ library
other-modules: Paths_cassandra_util
hs-source-dirs: src
default-extensions:
NoImplicitPrelude
AllowAmbiguousTypes
BangPatterns
ConstraintKinds
Expand All @@ -46,6 +45,7 @@ library
MultiParamTypeClasses
MultiWayIf
NamedFieldPuns
NoImplicitPrelude
NumericUnderscores
OverloadedRecordDot
OverloadedStrings
Expand Down
2 changes: 1 addition & 1 deletion libs/deriving-swagger2/deriving-swagger2.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ library
other-modules: Paths_deriving_swagger2
hs-source-dirs: src
default-extensions:
NoImplicitPrelude
AllowAmbiguousTypes
BangPatterns
ConstraintKinds
Expand All @@ -39,6 +38,7 @@ library
MultiParamTypeClasses
MultiWayIf
NamedFieldPuns
NoImplicitPrelude
OverloadedRecordDot
OverloadedStrings
PackageImports
Expand Down
4 changes: 2 additions & 2 deletions libs/dns-util/dns-util.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ library
other-modules: Paths_dns_util
hs-source-dirs: src
default-extensions:
NoImplicitPrelude
AllowAmbiguousTypes
BangPatterns
ConstraintKinds
Expand All @@ -44,6 +43,7 @@ library
MultiParamTypeClasses
MultiWayIf
NamedFieldPuns
NoImplicitPrelude
OverloadedRecordDot
OverloadedStrings
PackageImports
Expand Down Expand Up @@ -85,7 +85,6 @@ test-suite spec

hs-source-dirs: test
default-extensions:
NoImplicitPrelude
AllowAmbiguousTypes
BangPatterns
ConstraintKinds
Expand All @@ -109,6 +108,7 @@ test-suite spec
MultiParamTypeClasses
MultiWayIf
NamedFieldPuns
NoImplicitPrelude
OverloadedRecordDot
OverloadedStrings
PackageImports
Expand Down
4 changes: 2 additions & 2 deletions libs/extended/extended.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ library
other-modules: Paths_extended
hs-source-dirs: src
default-extensions:
NoImplicitPrelude
AllowAmbiguousTypes
BangPatterns
ConstraintKinds
Expand All @@ -54,6 +53,7 @@ library
MultiParamTypeClasses
MultiWayIf
NamedFieldPuns
NoImplicitPrelude
NumericUnderscores
OverloadedRecordDot
OverloadedStrings
Expand Down Expand Up @@ -116,7 +116,6 @@ test-suite extended-tests

hs-source-dirs: test
default-extensions:
NoImplicitPrelude
AllowAmbiguousTypes
BangPatterns
ConstraintKinds
Expand All @@ -140,6 +139,7 @@ test-suite extended-tests
MultiParamTypeClasses
MultiWayIf
NamedFieldPuns
NoImplicitPrelude
OverloadedRecordDot
OverloadedStrings
PackageImports
Expand Down
4 changes: 2 additions & 2 deletions libs/galley-types/galley-types.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ library
other-modules: Paths_galley_types
hs-source-dirs: src
default-extensions:
NoImplicitPrelude
AllowAmbiguousTypes
BangPatterns
ConstraintKinds
Expand All @@ -48,6 +47,7 @@ library
MultiParamTypeClasses
MultiWayIf
NamedFieldPuns
NoImplicitPrelude
OverloadedRecordDot
OverloadedStrings
PackageImports
Expand Down Expand Up @@ -103,7 +103,6 @@ test-suite galley-types-tests

hs-source-dirs: test/unit
default-extensions:
NoImplicitPrelude
AllowAmbiguousTypes
BangPatterns
ConstraintKinds
Expand All @@ -127,6 +126,7 @@ test-suite galley-types-tests
MultiParamTypeClasses
MultiWayIf
NamedFieldPuns
NoImplicitPrelude
OverloadedRecordDot
OverloadedStrings
PackageImports
Expand Down
2 changes: 1 addition & 1 deletion libs/gundeck-types/gundeck-types.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ library
other-modules: Paths_gundeck_types
hs-source-dirs: src
default-extensions:
NoImplicitPrelude
AllowAmbiguousTypes
BangPatterns
ConstraintKinds
Expand All @@ -46,6 +45,7 @@ library
MultiParamTypeClasses
MultiWayIf
NamedFieldPuns
NoImplicitPrelude
OverloadedRecordDot
OverloadedStrings
PackageImports
Expand Down
2 changes: 1 addition & 1 deletion libs/imports/imports.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ library
other-modules: Paths_imports
hs-source-dirs: src
default-extensions:
NoImplicitPrelude
AllowAmbiguousTypes
BangPatterns
ConstraintKinds
Expand All @@ -46,6 +45,7 @@ library
MultiParamTypeClasses
MultiWayIf
NamedFieldPuns
NoImplicitPrelude
OverloadedRecordDot
OverloadedStrings
PackageImports
Expand Down
4 changes: 2 additions & 2 deletions libs/jwt-tools/jwt-tools.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ library
hs-source-dirs: src
other-modules: Paths_jwt_tools
default-extensions:
NoImplicitPrelude
AllowAmbiguousTypes
BangPatterns
ConstraintKinds
Expand All @@ -40,6 +39,7 @@ library
MultiParamTypeClasses
MultiWayIf
NamedFieldPuns
NoImplicitPrelude
OverloadedRecordDot
OverloadedStrings
PackageImports
Expand Down Expand Up @@ -92,7 +92,6 @@ test-suite jwt-tools-tests
-Wredundant-constraints -Wunused-packages

default-extensions:
NoImplicitPrelude
AllowAmbiguousTypes
BangPatterns
ConstraintKinds
Expand All @@ -116,6 +115,7 @@ test-suite jwt-tools-tests
MultiParamTypeClasses
MultiWayIf
NamedFieldPuns
NoImplicitPrelude
OverloadedRecordDot
OverloadedStrings
PackageImports
Expand Down
Loading