Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,10 @@ cabal.project.local:

# Usage: make c package=brig test=1
.PHONY: c
c: treefmt
c: treefmt c-fast
Copy link
Contributor

Choose a reason for hiding this comment

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

Now that I see this, I'm wondering if our approach to squeeze everything into one makefile target fits to the idea of make. I.e. if someone wants to compile and format in one go, why don't they call e.g. make c format? 🤔

(I'm fine with your change though, because your intention probably was to keep the dev's interface stable.)


.PHONY: c
c-fast:
cabal build $(WIRE_CABAL_BUILD_OPTIONS) $(package) || ( make clean-hint; false )
ifeq ($(test), 1)
./hack/bin/cabal-run-tests.sh $(package) $(testargs)
Expand Down
1 change: 1 addition & 0 deletions libs/wire-api/src/Wire/API/Message/Proto.hs
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ userEntryClients f c = (\x -> c {_userVal = x}) <$> field f (_userVal c)
--------------------------------------------------------------------------------
-- Priority

-- | See also `Wire.API.Message.Priority`
data Priority = LowPriority | HighPriority
deriving stock (Eq, Show, Ord, Generic)

Expand Down
3 changes: 3 additions & 0 deletions services/gundeck/test/unit/ThreadBudget.hs
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ newtype NumberOfThreads = NumberOfThreads {fromNumberOfThreads :: Int}

-- | 'microseconds' determines how long one unit lasts. there is a trade-off of fast
-- vs. robust in this whole setup. this type is supposed to help us find a good sweet spot.
--
-- There is also `Milliseconds` (with small `s` after `Milli`) in "Data.Misc". maybe this
-- should be cleaned up...
newtype MilliSeconds = MilliSeconds {fromMilliSeconds :: Int}
deriving (Eq, Ord, Show, Generic, ToExpr)

Expand Down
24 changes: 0 additions & 24 deletions snapshots/README.md

This file was deleted.

122 changes: 0 additions & 122 deletions snapshots/wire-1.0.yaml

This file was deleted.

8 changes: 0 additions & 8 deletions snapshots/wire-1.1.yaml

This file was deleted.

8 changes: 0 additions & 8 deletions snapshots/wire-1.2.yaml

This file was deleted.

7 changes: 0 additions & 7 deletions snapshots/wire-1.3.yaml

This file was deleted.

20 changes: 0 additions & 20 deletions snapshots/wire-1.4.yaml

This file was deleted.

101 changes: 0 additions & 101 deletions snapshots/wire-2.0.yaml

This file was deleted.

24 changes: 0 additions & 24 deletions snapshots/wire-2.1.yaml

This file was deleted.

8 changes: 0 additions & 8 deletions snapshots/wire-2.2.yaml

This file was deleted.

Loading