Skip to content

Commit 64ba09f

Browse files
zergweakzergweak
committed
Merge branch 'develop' into develop-evan-addressvalid
2 parents 4512a27 + 96d2241 commit 64ba09f

40 files changed

Lines changed: 1040 additions & 739 deletions

‎.travis.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ script:
99
addons:
1010
ssh_known_hosts:
1111
- 47.93.9.236:22008
12-
- 47.93.33.201:22008
13-
- 123.56.10.6:22008
14-
- 39.107.80.135:22008
15-
- 47.93.184.2:22008
12+
# - 47.93.33.201:22008
13+
# - 123.56.10.6:22008
14+
# - 39.107.80.135:22008
15+
# - 47.93.184.2:22008
1616
skip_build:
1717
- README.md
1818
- LICENSE

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,4 +288,4 @@ Read the [Quick Start](http://wiki.tron.network/en/latest/quick_start.html).
288288

289289
* [TRON Protocol](https://github.com/tronprotocol/protocol)
290290
* [Wallet Client](https://github.com/tronprotocol/wallet-cli)
291-
* [Wallet Web](https://github.com/tronprotocol/Wallet_Web)
291+
* [Wallet Web](https://github.com/tronprotocol/wallet-web)

‎deploy.sh‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,2 @@
11
#!/bin/bash
2-
./gradlew clean shadowJar
3-
ssh tron@47.93.9.236 -p 22008 mkdir java-tron
4-
scp -P 22008 build/libs/java-tron.jar tron@47.93.9.236:/home/tron/java-tron/
5-
scp -P 22008 start.sh tron@47.93.9.236:/home/tron/java-tron/
6-
# ssh tron@47.93.9.236 -p 22008 sh java-tron/start.sh
7-
ls -a
2+
ssh tron@47.93.9.236 -p 22008 sh /home/tron/workspace/deploy_all.sh

0 commit comments

Comments
 (0)