Skip to content

Commit

Permalink
build: respect SKIP_SERVER_RUST in Makefile targets test and package
Browse files Browse the repository at this point in the history
  • Loading branch information
ErikBjare committed Jul 14, 2022
1 parent 67d5f71 commit 8fe419d
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,12 @@ test:
make --directory=aw-core test
make --directory=aw-client test
make --directory=aw-server test
make --directory=aw-server-rust test
make --directory=aw-qt test
ifeq ($(SKIP_SERVER_RUST),true) # Skip testing aw-server-rust if SKIP_SERVER_RUST is true
@echo "Skipping aw-server-rust test"
else
make --directory=aw-server-rust test
endif

test-integration:
# TODO: Move "integration tests" to aw-client
Expand Down Expand Up @@ -156,7 +160,9 @@ package:
#
make --directory=aw-server package
cp -r aw-server/dist/aw-server dist/activitywatch
ifndef SKIP_SERVER_RUST
ifeq ($(SKIP_SERVER_RUST),true)
@echo "Skipping aw-server-rust package"
else
make --directory=aw-server-rust package
mkdir -p dist/activitywatch/aw-server-rust
cp -r aw-server-rust/target/package/* dist/activitywatch/aw-server-rust
Expand Down

0 comments on commit 8fe419d

Please sign in to comment.