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

Makefile was using incorrect gradle targets #1174

Merged
merged 1 commit into from
Sep 15, 2023
Merged

Makefile was using incorrect gradle targets #1174

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,21 +118,21 @@ clean:
.start-clearnet-seeds: seed-type=clear
.start-clearnet-seeds:
# Seed 1
screen -S localtests -X screen -t ${seed1-title} ./gradlew --console=plain seed:run \
screen -S localtests -X screen -t ${seed1-title} ./gradlew --console=plain seed_node_app:run \
-Dapplication.appName=${seed1-appName} \
-Dapplication.network.defaultNodePortByTransportType.clear=8000 \
-Dapplication.network.supportedTransportTypes.0=CLEAR \
-Dapplication.network.seedAddressByTransportType.clear.1=127.0.0.1:8001
# Seed 2
screen -S localtests -X screen -t ${seed2-title} ./gradlew --console=plain seed:run \
screen -S localtests -X screen -t ${seed2-title} ./gradlew --console=plain seed_node_app:run \
-Dapplication.appName=${seed2-appName} \
-Dapplication.network.defaultNodePortByTransportType.clear=8001 \
-Dapplication.network.supportedTransportTypes.0=CLEAR \
-Dapplication.network.seedAddressByTransportType.clear.0=127.0.0.1:8000

.start-clearnet-clients:
for i in $$(seq 1 $n); do \
screen -S localtests -X screen -t client-$${i}-clear ./gradlew --console=plain desktop:run \
screen -S localtests -X screen -t client-$${i}-clear ./gradlew --console=plain desktop_app:run \
-Dapplication.appName=bisq_client$${i}_test \
-Dapplication.network.supportedTransportTypes.0=CLEAR \
-Dapplication.network.seedAddressByTransportType.clear.0=127.0.0.1:8000 \
Expand Down Expand Up @@ -165,7 +165,7 @@ seed2-tor-hostname:
# If any is not known, this will fail
.start-tor-clients: seed1-tor-hostname seed2-tor-hostname
for i in $$(seq 1 $n); do \
screen -S localtests -X screen -t client-$${i}-tor ./gradlew --console=plain desktop:run \
screen -S localtests -X screen -t client-$${i}-tor ./gradlew --console=plain desktop_app:run \
-Dapplication.appName=bisq_client$${i}_tor_test \
-Dapplication.network.supportedTransportTypes.0=TOR \
-Dapplication.network.seedAddressByTransportType.tor.0=$(file < seed1-tor-hostname):1000 \
Expand All @@ -175,7 +175,7 @@ seed2-tor-hostname:
.start-tor-seeds: seed-type=tor
.start-tor-seeds:
# Seed 1
screen -S localtests -X screen -t ${seed1-title} ./gradlew --console=plain seed:run \
screen -S localtests -X screen -t ${seed1-title} ./gradlew --console=plain seed_node_app:run \
-Dapplication.appName=${seed1-appName} \
-Dapplication.network.defaultNodePortByTransportType.clear=8000 \
-Dapplication.network.defaultNodePortByTransportType.tor=1000 \
Expand All @@ -184,7 +184,7 @@ seed2-tor-hostname:
-Dapplication.network.seedAddressByTransportType.clear.0=127.0.0.1:8000 \
-Dapplication.network.seedAddressByTransportType.clear.1=127.0.0.1:8001
# Seed 2
screen -S localtests -X screen -t ${seed2-title} ./gradlew --console=plain seed:run \
screen -S localtests -X screen -t ${seed2-title} ./gradlew --console=plain seed_node_app:run \
-Dapplication.appName=${seed2-appName} \
-Dapplication.network.defaultNodePortByTransportType.clear=8001 \
-Dapplication.network.defaultNodePortByTransportType.tor=1001 \
Expand Down Expand Up @@ -219,7 +219,7 @@ seed2-i2p-destination:
.start-i2p-seeds: seed-type=i2p
.start-i2p-seeds:
# Seed 1
screen -S localtests -X screen -t ${seed1-title} ./gradlew --console=plain seed:run \
screen -S localtests -X screen -t ${seed1-title} ./gradlew --console=plain seed_node_app:run \
-Dapplication.application.appName=${seed1-appName} \
-Dapplication.network.defaultNodePortByTransportType.i2p=5000 \
-Dapplication.network.supportedTransportTypes.0=I2P \
Expand All @@ -228,7 +228,7 @@ seed2-i2p-destination:
-Dapplication.network.seedAddressByTransportType.clear.0=127.0.0.1:8000 \
-Dapplication.network.seedAddressByTransportType.clear.1=127.0.0.1:8001
# Seed 2
screen -S localtests -X screen -t ${seed2-title} ./gradlew --console=plain seed:run \
screen -S localtests -X screen -t ${seed2-title} ./gradlew --console=plain seed_node_app:run \
-Dapplication.appName=${seed2-appName} \
-Dapplication.network.defaultNodePortByTransportType.i2p=5001 \
-Dapplication.network.supportedTransportTypes.0=I2P \
Expand All @@ -245,7 +245,7 @@ seed2-i2p-destination:
# the resulting cmd had to be built line by line ;\
# See .demo-send-large-command-to-screen for details ;\
screen -S localtests -X screen -t client-$${i}-i2p ;\
screen -S localtests -X stuff './gradlew --console=plain desktop:run ' ;\
screen -S localtests -X stuff './gradlew --console=plain desktop_app:run ' ;\
screen -S localtests -X stuff "-Dapplication.appName=bisq_client$${i}_i2p_test " ;\
screen -S localtests -X stuff '-Dapplication.network.supportedTransportTypes.0=CLEAR ' ;\
screen -S localtests -X stuff '-Dapplication.network.supportedTransportTypes.1=I2P ' ;\
Expand Down