Skip to content

Commit 3490dda

Browse files
ellandsmatting
andauthored
[chore] Add default suite to make ci (#3328)
* [chore] Remove suite from make ci arguments. make ci should run all tests and the new integration, same as make ci package=all. make ci package=x builds and runs that specific package. * Updated doc for make ci * Apply suggestions from code review Co-authored-by: Stefan Matting <[email protected]> * Fixed doc * Missed a spot. * removed redundant if clause --------- Co-authored-by: Stefan Matting <[email protected]>
1 parent c772be8 commit 3490dda

File tree

1 file changed

+5
-27
lines changed

1 file changed

+5
-27
lines changed

Makefile

Lines changed: 5 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,9 @@ endif
8585
./hack/bin/cabal-install-artefacts.sh $(package)
8686

8787
# ci here doesn't refer to continuous integration, but to cabal-run-integration.sh
88-
# Usage: make ci - build & run all tests
89-
# make ci package=brig - build brig & run "brig-integration" and "integration"
90-
# make ci package=brig suite=old - build brig & run "brig-integration"
91-
# make ci package=brig suite=new - build brig & run "integration"
88+
# Usage: make ci - build & run all tests, excluding integration
89+
# make ci package=all - build & run all tests, including integration
90+
# make ci package=brig - build brig & run "brig-integration"
9291
# make ci package=integration - build & run "integration"
9392
#
9493
# You can pass environment variables to all the suites, like so
@@ -98,31 +97,10 @@ endif
9897
.PHONY: ci
9998
ci: c db-migrate
10099
ifeq ("$(package)", "all")
101-
ifneq ("$(suite)", "new")
102-
./hack/bin/cabal-run-integration.sh all
103-
endif
104-
ifneq ("$(suite)", "old")
105-
make c package=integration
106-
./hack/bin/cabal-run-integration.sh integration
107-
endif
108-
else
109-
ifeq ("$(package)", "integration")
100+
./hack/bin/cabal-run-integration.sh all
110101
./hack/bin/cabal-run-integration.sh integration
111-
else
112-
ifeq ("$(suite)", "old")
113-
./hack/bin/cabal-run-integration.sh $(package)
114-
else
115-
ifeq ("$(suite)", "new")
116-
make c package=integration
117-
./hack/bin/cabal-run-integration.sh integration
118-
else
119-
make c package=integration
120-
./hack/bin/cabal-run-integration.sh $(package)
121-
./hack/bin/cabal-run-integration.sh integration
122-
endif
123-
endif
124-
endif
125102
endif
103+
./hack/bin/cabal-run-integration.sh $(package)
126104

127105
# Compile and run services
128106
# Usage: make crun `OR` make crun package=galley

0 commit comments

Comments
 (0)