From 254ec2c5960fd791d8b6b2e9b6fd41a7e39f6ac6 Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Fri, 1 Jun 2018 12:07:07 -0700 Subject: [PATCH 1/9] Automating kmd-cli tool packaging. --- .travis.yml | 51 ++++++++++++++---------------- kmd/linux/{ => kmd-cli}/README.txt | 0 kmd/linux/{ => kmd-cli}/verus | 0 kmd/linux/{ => kmd-cli}/verusd | 0 kmd/mac/{ => kmd-cli}/README.txt | 0 kmd/mac/{ => kmd-cli}/verus | 0 kmd/mac/{ => kmd-cli}/verusd | 0 zcutil/build-win.sh | 2 +- 8 files changed, 24 insertions(+), 29 deletions(-) rename kmd/linux/{ => kmd-cli}/README.txt (100%) rename kmd/linux/{ => kmd-cli}/verus (100%) mode change 100755 => 100644 rename kmd/linux/{ => kmd-cli}/verusd (100%) mode change 100755 => 100644 rename kmd/mac/{ => kmd-cli}/README.txt (100%) rename kmd/mac/{ => kmd-cli}/verus (100%) mode change 100755 => 100644 rename kmd/mac/{ => kmd-cli}/verusd (100%) mode change 100755 => 100644 diff --git a/.travis.yml b/.travis.yml index c45e82a94..3c2236994 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,12 +6,10 @@ compiler: - gcc env: global: - - SDK_URL=https://bitcoincore.org/depends-sources/sdks - - KOMODO_BUILD_DIR=Komodo-build - - COMPRESSED_BUILD=Komodo-build.tar.gz - CCACHE_SIZE=100M - CCACHE_TEMPDIR=/tmp/.ccache-temp - CCACHE_COMPRESS=1 + - STORAGE_DEST=gs://$BUCKET/$PROJECT/$TRAVIS_BRANCH/ cache: apt: true directories: @@ -23,48 +21,45 @@ matrix: fast_finish: true include: - compiler: ": Linux" - env: HOST=x86_64-unknown-linux-gnu TARGET_PLATFORM=linux64 BUILD_SCRIPT=build.sh - TRAVIS_OS_NAME=linux PACKAGES="build-essential pkg-config libc6-dev m4 g++-multilib + env: BUILD_SCRIPT=build.sh + PACKAGES="build-essential pkg-config libc6-dev m4 g++-multilib autoconf libtool ncurses-dev unzip python zlib1g-dev wget bsdmainutils automake libssl-dev libprotobuf-dev protobuf-compiler libqrencode-dev libdb++-dev software-properties-common - libcurl4-openssl-dev curl" PPA="ppa:chris-lea/zeromq" KOMODO_EXEC_SET="komodod - komodo-cli" + libcurl4-openssl-dev curl" + PACKAGE_NAME=kmd-cli-linux.tar.gz + PACKAGING_MATRIX="cd linux && cp ../../src/komodod ../../src/komodo-cli kmd-cli && tar -czf PACKAGE_NAME kmd-cli" - compiler: ": Windows" - env: HOST=x86_64-w64-mingw32 TARGET_PLATFORM=win64 RUST_TARGET=x86_64-pc-windows-gnu - BUILD_SCRIPT=build-win.sh PACKAGES="build-essential pkg-config libcurl3-gnutls-dev + env: RUST_TARGET=x86_64-pc-windows-gnu + BUILD_SCRIPT=build-win.sh + PACKAGES="build-essential pkg-config libcurl3-gnutls-dev libc6-dev libevent-dev m4 g++-multilib autoconf libtool ncurses-dev unzip git python zlib1g-dev wget bsdmainutils automake libssl-dev libprotobuf-dev protobuf-compiler - libdb++-dev ntp ntpdate mingw-w64 wine bc" KOMODO_EXEC_SET="komodod.exe komodo-cli.exe - komodo-tx.exe" + libdb++-dev ntp ntpdate mingw-w64 wine bc" + PACKAGE_NAME=kmd-cli-windows.zip + PACKAGING_MATRIX="cd windows && cp ../../src/komodod.exe ../../src/komodo-cli.exe + ../../src/komodo-tx.exe kmd-cli && zip -r9 $PACKAGE_NAME kmd-cli" exclude: - compiler: gcc install: -- if [ ! -d "$HOME/google-cloud-sdk/bin" ]; then rm -rf $HOME/google-cloud-sdk; export - CLOUDSDK_CORE_DISABLE_PROMPTS=1; curl https://sdk.cloud.google.com | bash; fi -- source /home/travis/google-cloud-sdk/path.bash.inc -- sudo rm -f /etc/apt/sources.list.d/travis_ci_zeromq3-source.list -- travis_retry sudo apt-get -y update && sudo apt-get -y install -qq $PACKAGES -- if [ $TARGET_PLATFORM = win64 ]; then curl -sSf https://build.travis-ci.org/files/rustup-init.sh - | sh -s -- --default-toolchain stable -y && export PATH=$PATH:$HOME/.cargo/bin:$PATH; - fi -- if [ $TARGET_PLATFORM = win64 ]; then rustup target add $RUST_TARGET; fi +- if [ $TRAVIS_OS_NAME = linux ]; then sudo rm -f /etc/apt/sources.list.d/travis_ci_zeromq3-source.list && + travis_retry sudo apt-get -y update && travis_retry sudo apt-get -y install -qq $PACKAGES +- if [ -n "$RUST_TARGET" ]; then curl -sSf https://build.travis-ci.org/files/rustup-init.sh + | sh -s -- --default-toolchain stable -y && export PATH=$PATH:$HOME/.cargo/bin:$PATH && rustup target add $RUST_TARGET; fi before_script: - unset CC; unset CXX -- mkdir -p depends/SDKs depends/sdk-sources script: - "./zcutil/fetch-params.sh" - "./zcutil/$BUILD_SCRIPT -j2" after_script: -- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gcloud auth activate-service-account - --key-file AUTH_KEY.json; fi -- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then cd src && mkdir $TARGET_PLATFORM && - cp -r $KOMODO_EXEC_SET $TARGET_PLATFORM && tar -czvf $TARGET_PLATFORM.tar.gz $TARGET_PLATFORM; - fi -- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gsutil cp $TARGET_PLATFORM.tar.gz - gs://$BUCKET/$PROJECT/$TRAVIS_BRANCH/; fi +- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then cd kmd && eval "${PACKAGING_MATRIX}" && + gsutil cp $PACKAGE_NAME $STORAGE_DEST; fi notifications: slack: secure: FiVlFhSw5xnDu1Cx2yAo3J7miFCSRyuzR/2+8LKFjdWl5+fyIGvQ9x5vgUg6dWbv3UP9iIMqQuWfotsg8H+NE8pYRZQ0zDVxZ5h9+PA028qGb3OF4TMFNcltP5DGtAZ6AqrMNRZ4ltatPUm5H9ig1bhzjsx+3pqlqQuVXTXPjaUryB5s/fk2CjrsV6zTLfPHiI30jeMjmQrJJLik1vSWF70sB6HkQhvaT6jymkO4Vuh+cja418W1xIgkkoRsOXiZ/JK4hIypFo/sBkmIOprGqoFUahFqJlsBoSrp9iAzkwbDItIqqvNCHTEeN7lj6kK43ZK72E4etjjNc0CXWeleXBJBCj5Prq2lEkQ4NwuDTos3KLyyr2vI7f54xhb5+wjzY9dByHXGuG5UaNz0+uukuJinAdazGaNmmfesv1wg9p3jGa/TLsfHLMcUti875DzkUHnenivP5cXrc6/uuZyyQNq5+Gn/3DA8k0y7d1e23nm3nDjCNfATAn3yu1jieYY2yYI6CYGEXcD+UbP61uG6no+mm/lkQbQosyDfE0sADqGryqXswRste+R0sSVMBQtTipAZOUoYNbEmhN4+L78SSp3zpmgkrIxAw7le8oj6Evp2ofvE2Kvh+Z0MVoEJx6mtZI6hheIFSS38NeUZr/HBfRSpaElOYTN/ZNf8QwThCWo= before_install: - openssl aes-256-cbc -K $encrypted_11153c0bb86c_key -iv $encrypted_11153c0bb86c_iv -in AUTH_KEY.json.enc -out AUTH_KEY.json -d +- if [ ! -d "$HOME/google-cloud-sdk/bin" ]; then rm -rf $HOME/google-cloud-sdk; export + CLOUDSDK_CORE_DISABLE_PROMPTS=1; curl https://sdk.cloud.google.com | bash; fi +- source /home/travis/google-cloud-sdk/path.bash.inc +- gcloud auth activate-service-account --key-file AUTH_KEY.json; fi diff --git a/kmd/linux/README.txt b/kmd/linux/kmd-cli/README.txt similarity index 100% rename from kmd/linux/README.txt rename to kmd/linux/kmd-cli/README.txt diff --git a/kmd/linux/verus b/kmd/linux/kmd-cli/verus old mode 100755 new mode 100644 similarity index 100% rename from kmd/linux/verus rename to kmd/linux/kmd-cli/verus diff --git a/kmd/linux/verusd b/kmd/linux/kmd-cli/verusd old mode 100755 new mode 100644 similarity index 100% rename from kmd/linux/verusd rename to kmd/linux/kmd-cli/verusd diff --git a/kmd/mac/README.txt b/kmd/mac/kmd-cli/README.txt similarity index 100% rename from kmd/mac/README.txt rename to kmd/mac/kmd-cli/README.txt diff --git a/kmd/mac/verus b/kmd/mac/kmd-cli/verus old mode 100755 new mode 100644 similarity index 100% rename from kmd/mac/verus rename to kmd/mac/kmd-cli/verus diff --git a/kmd/mac/verusd b/kmd/mac/kmd-cli/verusd old mode 100755 new mode 100644 similarity index 100% rename from kmd/mac/verusd rename to kmd/mac/kmd-cli/verusd diff --git a/zcutil/build-win.sh b/zcutil/build-win.sh index a3288e879..5c12893fa 100755 --- a/zcutil/build-win.sh +++ b/zcutil/build-win.sh @@ -10,7 +10,7 @@ set -x cd "$(dirname "$(readlink -f "$0")")/.." cd depends/ && make HOST=$HOST V=1 NO_QT=1 -cd .. +cd ../ ./autogen.sh CONFIG_SITE=$PWD/depends/x86_64-w64-mingw32/share/config.site CXXFLAGS="-DPTW32_STATIC_LIB -DCURL_STATICLIB -DCURVE_ALT_BN128 -fopenmp -pthread" ./configure --prefix="${PREFIX}" --host=x86_64-w64-mingw32 --enable-static --disable-shared sed -i 's/-lboost_system-mt /-lboost_system-mt-s /' configure From 91617141e73cdd382babcfa91fe826a3aea9be5e Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Fri, 1 Jun 2018 12:14:23 -0700 Subject: [PATCH 2/9] removing unnecessary token --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3c2236994..c778659cc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -62,4 +62,4 @@ before_install: - if [ ! -d "$HOME/google-cloud-sdk/bin" ]; then rm -rf $HOME/google-cloud-sdk; export CLOUDSDK_CORE_DISABLE_PROMPTS=1; curl https://sdk.cloud.google.com | bash; fi - source /home/travis/google-cloud-sdk/path.bash.inc -- gcloud auth activate-service-account --key-file AUTH_KEY.json; fi +- gcloud auth activate-service-account --key-file AUTH_KEY.json From 9168358987f09c1925ca66c662fb73111d34a1d9 Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Fri, 1 Jun 2018 12:16:58 -0700 Subject: [PATCH 3/9] Closing conditional --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c778659cc..c557382c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,7 +42,7 @@ matrix: - compiler: gcc install: - if [ $TRAVIS_OS_NAME = linux ]; then sudo rm -f /etc/apt/sources.list.d/travis_ci_zeromq3-source.list && - travis_retry sudo apt-get -y update && travis_retry sudo apt-get -y install -qq $PACKAGES + travis_retry sudo apt-get -y update && travis_retry sudo apt-get -y install -qq $PACKAGES; fi - if [ -n "$RUST_TARGET" ]; then curl -sSf https://build.travis-ci.org/files/rustup-init.sh | sh -s -- --default-toolchain stable -y && export PATH=$PATH:$HOME/.cargo/bin:$PATH && rustup target add $RUST_TARGET; fi before_script: From 50d3f53b83d7452b5e9bfba35bb14fbb9036347d Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Fri, 1 Jun 2018 13:40:26 -0700 Subject: [PATCH 4/9] Travis clean up --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index c557382c9..49dcf7082 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ matrix: libssl-dev libprotobuf-dev protobuf-compiler libqrencode-dev libdb++-dev software-properties-common libcurl4-openssl-dev curl" PACKAGE_NAME=kmd-cli-linux.tar.gz - PACKAGING_MATRIX="cd linux && cp ../../src/komodod ../../src/komodo-cli kmd-cli && tar -czf PACKAGE_NAME kmd-cli" + PACKAGING_MATRIX="cp src/komodod src/komodo-cli kmd/linux/kmd-cli && cd kmd/linux && tar -czf PACKAGE_NAME kmd-cli" - compiler: ": Windows" env: RUST_TARGET=x86_64-pc-windows-gnu BUILD_SCRIPT=build-win.sh @@ -36,8 +36,8 @@ matrix: python zlib1g-dev wget bsdmainutils automake libssl-dev libprotobuf-dev protobuf-compiler libdb++-dev ntp ntpdate mingw-w64 wine bc" PACKAGE_NAME=kmd-cli-windows.zip - PACKAGING_MATRIX="cd windows && cp ../../src/komodod.exe ../../src/komodo-cli.exe - ../../src/komodo-tx.exe kmd-cli && zip -r9 $PACKAGE_NAME kmd-cli" + PACKAGING_MATRIX="cp src/komodod.exe src/komodo-cli.exe src/komodo-tx.exe kmd/windows/kmd-cli && + cd kmd/windows && zip -r9 $PACKAGE_NAME kmd-cli" exclude: - compiler: gcc install: @@ -51,7 +51,7 @@ script: - "./zcutil/fetch-params.sh" - "./zcutil/$BUILD_SCRIPT -j2" after_script: -- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then cd kmd && eval "${PACKAGING_MATRIX}" && +- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then eval "${PACKAGING_MATRIX}" && gsutil cp $PACKAGE_NAME $STORAGE_DEST; fi notifications: slack: From f0b1b3ad815cce0e14825df1befa3c7493c3783d Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Fri, 1 Jun 2018 14:45:11 -0700 Subject: [PATCH 5/9] moving kmd tools into kmd-cli dir --- kmd/windows/{ => kmd-cli}/verusd.bat | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename kmd/windows/{ => kmd-cli}/verusd.bat (100%) diff --git a/kmd/windows/verusd.bat b/kmd/windows/kmd-cli/verusd.bat similarity index 100% rename from kmd/windows/verusd.bat rename to kmd/windows/kmd-cli/verusd.bat From 133ec8899a88e300a70529c8d9e3858dd8604c52 Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Fri, 1 Jun 2018 14:45:57 -0700 Subject: [PATCH 6/9] Moving kmd tools into kmd-cli --- kmd/windows/{ => kmd-cli}/README.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename kmd/windows/{ => kmd-cli}/README.txt (100%) diff --git a/kmd/windows/README.txt b/kmd/windows/kmd-cli/README.txt similarity index 100% rename from kmd/windows/README.txt rename to kmd/windows/kmd-cli/README.txt From 4189580fac20488555aba6678c7d6bbc8a99d54d Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Fri, 1 Jun 2018 14:46:23 -0700 Subject: [PATCH 7/9] Rename kmd/windows/verus.bat to kmd/windows/kmd-cli/verus.bat --- kmd/windows/{ => kmd-cli}/verus.bat | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename kmd/windows/{ => kmd-cli}/verus.bat (100%) diff --git a/kmd/windows/verus.bat b/kmd/windows/kmd-cli/verus.bat similarity index 100% rename from kmd/windows/verus.bat rename to kmd/windows/kmd-cli/verus.bat From 09dd2669b53ace9c4ea99d07eacdb0e092a520a1 Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Fri, 1 Jun 2018 14:50:37 -0700 Subject: [PATCH 8/9] Travis Cleanup --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 49dcf7082..ae724fdb1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ matrix: libssl-dev libprotobuf-dev protobuf-compiler libqrencode-dev libdb++-dev software-properties-common libcurl4-openssl-dev curl" PACKAGE_NAME=kmd-cli-linux.tar.gz - PACKAGING_MATRIX="cp src/komodod src/komodo-cli kmd/linux/kmd-cli && cd kmd/linux && tar -czf PACKAGE_NAME kmd-cli" + PACKAGING_MATRIX="cp src/komodod src/komodo-cli kmd/linux/kmd-cli && cd kmd/linux && tar -czf $PACKAGE_NAME kmd-cli && ls" - compiler: ": Windows" env: RUST_TARGET=x86_64-pc-windows-gnu BUILD_SCRIPT=build-win.sh @@ -37,7 +37,7 @@ matrix: libdb++-dev ntp ntpdate mingw-w64 wine bc" PACKAGE_NAME=kmd-cli-windows.zip PACKAGING_MATRIX="cp src/komodod.exe src/komodo-cli.exe src/komodo-tx.exe kmd/windows/kmd-cli && - cd kmd/windows && zip -r9 $PACKAGE_NAME kmd-cli" + cd kmd/windows && zip -r9 $PACKAGE_NAME kmd-cli && ls" exclude: - compiler: gcc install: From aa82415d61a4e693e1e57f1c24ff41f0e2b4beda Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Fri, 1 Jun 2018 20:39:09 -0700 Subject: [PATCH 9/9] Changing permissions for linux executables --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ae724fdb1..8b4181723 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ matrix: libssl-dev libprotobuf-dev protobuf-compiler libqrencode-dev libdb++-dev software-properties-common libcurl4-openssl-dev curl" PACKAGE_NAME=kmd-cli-linux.tar.gz - PACKAGING_MATRIX="cp src/komodod src/komodo-cli kmd/linux/kmd-cli && cd kmd/linux && tar -czf $PACKAGE_NAME kmd-cli && ls" + PACKAGING_MATRIX="cp src/komodod src/komodo-cli kmd/linux/kmd-cli && chmod -R +x kmd/linux/kmd-cli/ && cd kmd/linux && tar -czf $PACKAGE_NAME kmd-cli && ls" - compiler: ": Windows" env: RUST_TARGET=x86_64-pc-windows-gnu BUILD_SCRIPT=build-win.sh @@ -63,3 +63,5 @@ before_install: CLOUDSDK_CORE_DISABLE_PROMPTS=1; curl https://sdk.cloud.google.com | bash; fi - source /home/travis/google-cloud-sdk/path.bash.inc - gcloud auth activate-service-account --key-file AUTH_KEY.json +- rm AUTH_KEY.json && rm AUTH_KEY.json.enc +