Skip to content
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

[WPB-14307] Makefile tweaks #4399

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

[WPB-14307] Makefile tweaks #4399

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5f37d2
Walk filesystem with treefmt, not git.
fisx Jan 6, 2025
e526e9c
Make make faster.
fisx Jan 6, 2025
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
29 changes: 13 additions & 16 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,8 @@ clean-hint:
cabal.project.local:
cp ./hack/bin/cabal.project.local.template ./cabal.project.local

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

.PHONY: c
# Usage: make c-fast package=brig test=1
.PHONY: c-fast
c-fast:
cabal build $(WIRE_CABAL_BUILD_OPTIONS) $(package) || ( make clean-hint; false )
ifeq ($(test), 1)
Expand All @@ -108,7 +105,7 @@ endif
#
# If you want to pass arguments to the test-suite call cabal-run-integration.sh directly.
.PHONY: ci-fast
ci-fast: c db-migrate
ci-fast: c-fast db-migrate
ifeq ("$(package)", "all")
./hack/bin/cabal-run-integration.sh all
./hack/bin/cabal-run-integration.sh integration
Expand All @@ -118,7 +115,7 @@ endif
# variant of `make ci-fast` that compiles the entire project even if `package` is specified.
.PHONY: ci-safe
ci-safe:
make c package=all
make c-fast package=all
make ci-fast

.PHONY: ci
Expand All @@ -128,10 +125,10 @@ ci:
# Compile and run services
# Usage: make crun `OR` make crun package=galley
.PHONY: cr
cr: c db-migrate
cr: c-fast db-migrate
./dist/run-services

crm: c db-migrate
crm: c-fast db-migrate
./dist/run-services -m

# Run integration from new test suite
Expand Down Expand Up @@ -168,7 +165,7 @@ ghcid:

# Used by CI
.PHONY: lint-all
lint-all: formatc hlint-check-all lint-common
lint-all: treefmt lint-common formatc hlint-check-all

# For use by local devs.
#
Expand All @@ -179,7 +176,7 @@ lint-all: formatc hlint-check-all lint-common
# The extra 'hlint-check-pr' has been witnessed to be necessary due to
# some bu in `hlint-inplace-pr`. Details got lost in history.
.PHONY: lint-all-shallow
lint-all-shallow: lint-common formatf hlint-inplace-pr hlint-check-pr
lint-all-shallow: treefmt lint-common formatf hlint-inplace-pr hlint-check-pr

.PHONY: lint-common
lint-common: check-local-nix-derivations treefmt-check # weeder (does not work on CI yet)
Expand Down Expand Up @@ -255,11 +252,11 @@ add-license:

.PHONY: treefmt
treefmt:
treefmt -u debug --walk=git
treefmt -u debug --walk=filesystem

.PHONY: treefmt-check
treefmt-check:
treefmt --fail-on-change -u debug --walk=git
treefmt --fail-on-change -u debug --walk=filesystem

#################################
## docker targets
Expand Down Expand Up @@ -314,7 +311,7 @@ db-migrate-package:

# Reset all keyspaces and reset the ES index
.PHONY: db-reset
db-reset: c
db-reset: c-fast
@echo "Make sure you have ./deploy/dockerephemeral/run.sh running in another window!"
./dist/brig-schema --keyspace brig_test --replication-factor 1 --reset
./dist/galley-schema --keyspace galley_test --replication-factor 1 --reset
Expand Down Expand Up @@ -344,7 +341,7 @@ db-reset: c

# Migrate all keyspaces and reset the ES index
.PHONY: db-migrate
db-migrate: c
db-migrate: c-fast
./dist/brig-schema --keyspace brig_test --replication-factor 1 > /dev/null
./dist/galley-schema --keyspace galley_test --replication-factor 1 > /dev/null
./dist/gundeck-schema --keyspace gundeck_test --replication-factor 1 > /dev/null
Expand Down
Loading