Fix make clean; allow new data constructors in ToSchema Version. (#…

…2965)
wireapp · Jan 10, 2023 · 6f91151 · 6f91151
1 parent 43a6a3d
commit 6f91151
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -58,7 +58,6 @@ endif
 .PHONY: clean
 clean:
 	cabal clean
-	$(MAKE) -C services/nginz clean
 	-rm -rf dist
 
 .PHONY: clean-hint

diff --git a/changelog.d/5-internal/pr-2965 b/changelog.d/5-internal/pr-2965
@@ -0,0 +1 @@
+Fix `make clean`; allow new data constructors in `ToSchema Version` instance
diff --git a/libs/wire-api/src/Wire/API/Routes/Version.hs b/libs/wire-api/src/Wire/API/Routes/Version.hs
@@ -64,11 +64,7 @@ data Version = V0 | V1 | V2 | V3
 instance ToSchema Version where
   schema =
     enum @Integer "Version" . mconcat $
-      [ element 0 V0,
-        element 1 V1,
-        element 2 V2,
-        element 3 V3
-      ]
+      (\v -> element (fromIntegral $ fromEnum v) v) <$> [minBound @Version ..]
 
 mkVersion :: Integer -> Maybe Version
 mkVersion n = case Aeson.fromJSON (Aeson.Number (fromIntegral n)) of
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix `make clean`; allow new data constructors in `ToSchema Version` instance