From 39a8d075de32661757c4a023ac24937728e7035c Mon Sep 17 00:00:00 2001 From: David Dawes Date: Sat, 5 May 2018 15:50:42 -0700 Subject: [PATCH 1/9] Add some build details. --- README.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/README.md b/README.md index 65f34d3d4..ee1c29922 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,26 @@ Dependencies sudo apt-get install build-essential pkg-config libc6-dev m4 g++-multilib autoconf libtool ncurses-dev unzip git python python-zmq zlib1g-dev wget libcurl3-gnutls-dev bsdmainutils automake ``` +Building +-------- + +First time you'll need to get assorted startup values downloaded. This takes a moderate amount of time once but then does niot need to be repeated unless you bring a new system up. The command is: +``` +./zcutil/fetch-params.sh +``` +Building for Ubunutu/Mint: +``` +./zcutil/build.sh +``` +Building for Mac OS/X: +``` +./zcutil/build-mac.sh +``` +Building for Windows: +``` +./zcutil/build-win.sh +``` + Komodo ------ We have a release process that goes through several stages before it reaches master. This allows the most conservative users just use the master branch, which is only updated after the other branches have signed off on a release. From aba193e39d1a772c4cf75bb7d410b0261a710534 Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Fri, 25 May 2018 21:57:18 -0700 Subject: [PATCH 2/9] adding auth --- .travis.yml | 28 +++++++++++++--------------- AUTH_KEY.json.enc | Bin 2352 -> 2352 bytes 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index aba91579a..cd493f0a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,23 +23,19 @@ matrix: fast_finish: true include: - compiler: ": Linux" - env: 'HOST=x86_64-unknown-linux-gnu TARGET_PLATFORM=Linux64 BUILD_SCRIPT=build.sh + 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 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=src/komodod\ - src/komodo-cli COMPRESSED_BUILD=Komodo-build.tar.gz - -' + libcurl4-openssl-dev curl" PPA="ppa:chris-lea/zeromq" KOMODO_EXEC_SET="src/komodod + src/komodo-cli" COMPRESSED_BUILD=Komodo-build.tar.gz - compiler: ": Windows" - env: 'HOST=x86_64-w64-mingw32 TARGET_PLATFORM=Win64 RUST_TARGET=x86_64-pc-windows-gnu + 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 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=src/komodod.exe\ - src/komodo-cli.exe\ src/komodo-tx.exe KOMODO_BUILD_DIR=Komodo-build COMPRESSED_BUILD=Komodo-build.tar.gz - -' + libdb++-dev ntp ntpdate mingw-w64 wine bc" KOMODO_EXEC_SET="src/komodod.exe + src/komodo-cli.exe src/komodo-tx.exe" COMPRESSED_BUILD=Komodo-build.tar.gz exclude: - compiler: gcc install: @@ -61,13 +57,15 @@ script: 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 mkdir -p src/$KOMODO_BUILD_DIR && cp $KOMODO_EXEC_SET - src/$KOMODO_BUILD_DIR && cd src && tar -czvf $COMPRESSED_BUILD $KOMODO_BUILD_DIR; fi -- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gsutil cp $COMPRESSED_BUILD gs://$BUCKET/$PROJECT/$TRAVIS_BRANCH/$TARGET_PLATFORM/; - fi +- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gsutil cp gs://$BUCKET/CI-TESTS/$PROJECT/$TRAVIS_BRANCH/$TARGET_PLATFORM.tar.gz + . && tar -xzvf $TARGET_PLATFORM.tar.gz && ls && rm $TARGET_PLATFORM.tar.gz; fi +- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then cp -rv $KOMODO_EXEC_SET $TARGET_PLATFORM + && cd src && tar -czvf $TARGET_PLATFORM.tar.gz $TARGET_PLATFORM; fi +- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gsutil cp -rv $TARGET_PLATFORM.tar.gz + gs://$BUCKET/CI-TESTS/$PROJECT/$TRAVIS_BRANCH/; fi notifications: slack: secure: A7JtO9RXl0Tgx09IWwUKbCuZ0oTC4wM4jthsV2CW3AS7r5Iz1qMFBnb7sb8744f40vi/QYjbr1KHkdOEbSJqWzOJS7oelSM9kyck808un7zZ8OwweXdGqdirNmIR3x+IQAYZw2lvYZcUBX/5h8eXK2LU67Rsve5I1WRGPtz0rmctFeRG6Xe0yGpMDYYxt4Ce/L7N5h3cC2eak8pQU6mSyQog0yvbiM73CFzz//bWughamOHKLx6o8BDgklwuCuh4rHQe/0kwVq1AoPQMqxuKQTsGAmub4mrDcsde39h3uo4GjAqAgfmL2e4hyp8fumdd7BtrQaFF4UBqyR8Xo/Ao97Ca7Dbeii5Eq7sl5/sTxZRdjy+MFD7z+jFpLkXfivBradyu0jABT5YYYMzZOCkpOGl5l3YymT86HKO5RBHyZLNL06jxHLti3NYBvFC6C+0yZrJOo7KN9DMqHHLZ5Y3ASZqbARWlVDE4oQmauyn4X2d6EOoE7ohwHwpY/LbVNFmrGvD+jAf4dOttwCMoWnT2pLWzs8Tl4FrvDGR3tbmZSCR/0NfbbeGrv9YNJtUghjubp1OikaZ3/Hs0+yJVsKo3kVd+dZvT/5u9MD6bu/cSdBRnoG0orca9QB8obaTEQ+71XC63D0hwDoZ9IgX6qVv+3KFErHZdZGiQBZI2yXSckvI= before_install: -- openssl aes-256-cbc -K $encrypted_11153c0bb86c_key -iv $encrypted_11153c0bb86c_iv +- openssl aes-256-cbc -K $encrypted_80a07e64c04e_key -iv $encrypted_80a07e64c04e_iv -in AUTH_KEY.json.enc -out AUTH_KEY.json -d diff --git a/AUTH_KEY.json.enc b/AUTH_KEY.json.enc index ff2e4ce967a1ae652bc5aab3c33e55d97ba50581..2ef6245d853e98605dc1d1a0f39906a5ea9c6c4f 100644 GIT binary patch literal 2352 zcmV-03D5RFJz5f96*BL8_U;zR?i(LG)ka9K-{OFwk+M|mpg8F0EMj4dB+ndAISx50 z_<4HcDF~%3R zVAARd2nr*L>Mrqmg=wU^L*-THPb`j_?c%BWlLAz>+%L9f)6#dkA z@iE!D#N!#j0&j)J1@e3$RvS1Yq(QPepUPhf?dpukB8b>zu8_M@K|#I}u`gFcqvyMk zb`!7Y22U4-H!l=`NJraBpb#JzB@un%nXj3%fFfh^f_Hd4jJ$M3z4W6Aj}eR9BP#5N zR&~1swjoze;b+8a+Y~j$$(wA)*P;*knEO_gFrr#ugLbb!M2-HG6sc+ytNB+2#?P{i zL_Tx*X4n%7`2+dXReJ#8H2@au^M`APl!qKyn?bAXCioa-&IOQ|DgBt+mPzQ-1xy<| zqMcUv=BKIyKg#3NQC(Hf7JhwQH5^wU9yp_dd zbIp1-#Ol`%tr$#gCu$Ow47JX1%9UvWTZy9hGU#~=*Lq&&81d}8FZ?P+cFcY@D`w2VH}B0cIxy>CZ4*cGXb!WQjf{n znbCH!1O(TbGd+vsg*^;gvRy&%^|5cD{ply-U{sA4sLxc27p^=OQ|e`a&Aon4y|Gu) zEk9%@+(fGnYPiZb^#nq_yu0{!~nC2GAt1h%|J%VTdAs$&TIeyDAOI~BMiB}+hz1ZUc7 zDn%h3ZU#A#PuZ^8`2EZpnJ3KyPm3zQ9er5);|Mq}6CRmp;EdeF#{osyHfyMa0;U?V zejjPGNFTIH{UIVM|8#ZY)BoDYUyzg{C%@&D?9){X)?t&y9}?lAwwH_<4p0tpiB4bKE!#95UM zJ2?C_aBiCeQ$Fh<9(Jw5Lj9I7U^1obyMbkRn?fi?)bSq27*9=tj{8fmurn-n3hSr61<->f<=7&r_0(9HF< zc^HV-i~oNdood>mm|_=Kv?R{fOd2o~>^?e-dwUGwblKcKpH|pYzEIPXwUIX@teKHQ zD!{$;sw>6z5Y&>ox*T8uZ$+PG*ac?;Qx?byZs}YNpv)#<3KIJLFd5^(u;Xsz_2z`%G9r@iu78H8~9Z1YNhQ{NAxhrZHI` zmp{pj=szv2UviZXS_Vhq-8?GvMz*YZ1U>%?)k|e{)Q?*yih-xZde(!NR0##GXU$2v zuAhC;?As!|K^Hu$yB_ss=>l(P&hL1{|6xYWbDB&~IyKCVZ7z0E!)7bL=>i&-OGeBM z?{E!j>{?O=1wfI#9eqf`S(R`9l{5NmMkJ0zbm~Nj@)*~hO}F(fa(w}t>d(9RWwcIo z znEQ;!`!)RD9c1~ZMK)K*z( z3l50d7RZ;B4`V+h=?R4Ax4%2ZfLjz~fNF82asge;z;>~dHX9C2rzpG{3Yu(by^;eQ zr-qnK&rq2?A|6Uugl*^|okKt&aP*$IWYejaiOU1@Ns%>O(Z}a&oe=W{9r}3;l!Z?_ z`jU&nOwV)&*7Jc|zIIjQZtmL(EBZ^m5d6+st2NbyLzvPXBYm68k!|s|y+PK+BKB%b z7zJOzycpo~o^6Gj2NGyfA@8>@4RC`qVR$pd@)rC2F}DnyfG-d@yHn&7LQ7ts>ux*o z(x}#8kc#H1C~{@$?bS2PJzU^IQ2V8^q*i! z<~Q-tdysU~wo2+!oQZzZl8W%q!Fw_~1zaX)!aK0??>kFi;dr<@wi_-;O@EQztRd-J z2UXX+xWs0(sm&^TL@(X^gikF&GGjuDSu!C4^^=_bx*g`k? zC)R$9vTPJce1eH~1gW44S^9`Rkwu;I9WV9og5jev$bXPx^^E29UQ@dnAzxKyyXJV; zOP=OuC3Wq*cLMf1+i!rK8d7x z$AfgHkKA-}9HBXHZO3u~i+O4sD#%yTLsbxs{J|3PP>qjorsj?Url66~94@!2>gpAT W)RVtspq{@v6VaG8nI;1Sx_9gy z%dn(|#MMHO#v&1(eUurIYYO?{pD*1(84r4Ga-eVpCS5IM#O7kPfrExz&T*o~{gwAR zehB56ATl{bby(mM4I45aS@rm@*OtMhDKU6$MvF)c08GDBlI|`DlXaG4&Hv7j%WZgd zv(rd4px^I~UBwdyo$-%la8CnL?vY=T@f@90ff00ue$b(Cq0X-Cr=iiguq9?aC&@MH zjt}eiB<6H^G+7L3ELiPSu|QVaxByUAgcV(v_u|7VoWoV}<7Zn80<~Li7^~-8AL6qlOj_!l@t3u#<%7$9 zj#Lz&o-~>iJvU!O?At0YX^jNrf*byn~b9` zsl}px;gWs6g&b3D&Gn#OB&-F?K=lMY?!?A>#rxT+?`i==98`+zZ{+6j#g97TdH z@$WAvH==6h>}^Khr4|99Eb%ul@+!B(m}hx97LZuip`cOwpRC$zdCN(0+hK9#QgzQ} zT{ZFRSy+$cYgx=iD66lRr#%9Jf%UstP1+b|u&rJ7m9y#$$;M)f3{IKYDqkeoz|_BF z0f*G})?}xP=D0qe%7ibFWj!}~sV-~mQj^-EZ^{7g+@hp+VD~tgNSpAG-`!R*c=ZmG zXG-WvpA??y`x3R!?1XJWt)*tD$dskh8ovm^ncW{PJ!TCzo&*9kk!~P6;;7|$cX)NF zE{J{aB)Va%GjdewQ^%75Q?OQ=bFJ-cajJMU-(i#&t2}N;S`Z&(XtnAxb$sbR_3}&c@dG zI->B9?-`3Z4UfzeWWyS(xRuHIJOb;bU6`pB*;-`cMCd0XFgLr?%Ok5P*er5@J!u5j zNXX~X^$;P+C{B5=H0jkwY8O1MZDi9eeU%`*FAkx>q}ViaH%YzMWy(#sVUIa>4NeZw z=82PmaJ5fA5ssh>Ao9}%`1cf;BH*~eq1xU^g2^e9*L`B;^)!@?GSVKUTfeoWy zSf-+3{}bxBH`E)!GR-H@>_WKiFtQiW#*>>ptpqR+G5WbxsVD_Ai@T>AcS78WxhhQo zUpZxCWd7j-N{+sUR<@2^P@{rzQSH5Y9-50O9&{Yt6nRQ~bb{GHb83LEIKR`uojHel z(4j|qlFG0?G@mepOX-M)k$Fz^<33-y-139l_w$GQi{r@>Odsi%$aVbvMe^|2ym4g*MZAYMP<-PmS7_ltXKn>6r- z31*LgUjiklnuacWuxdw5$*$&Zf?dE!FMw=V^feNu*06J0% zsdYT6e*nbP1V&3%|8m|>O?J1CcfQ<5JYTvM$*v**e)(^ zM&o(RNx8nK$vY@Mp%?GKRUz_^jW^azo#}0ypQPTPC(lH-ljRFF@Nx>>u9(POVfV#aS56iaQF8-?{1eXjXe!~_d@JXpw_41nM)=Ds7TFASeXcG>K+|E6TXx3 zPf{OwQ)Y{lD<=44@Ro8qIe2#6yeBipfa3uKJq0IOKu^JD=Z+?0DbaN1(2aA+hEDra z53crI5kGnp`5LNL8>d7~HH*tE_eefu8IxI|0L$j^&JKt3@V42gRCPQEOm|6*VDuL=8_H1`xeiYDlDzBcP8#@Ch zvE^YSD1Wmw!xS0%T?U0qLG~!1apekOC4zLZ-$+o%M-F;sG$f^1*rkyeIXSEG)_nRb zElfTtF*6s9+)10;OAuvyD9?Cr`Yj=t_Dug>|D~%mb1}98p7WNRbr|2LB=4Lq@A)IQ zyf}sHSE0ZUAHI!+RQh@tq)~SB!cxqfxp1Z-w|%e6TJ@Xbfafz_m}=o*sA4o_ZF3%k z+X8ulO*DUmDF=1L`QMTD6;xCX#JsFl9%hGYf=T!DCCVv$yJ(1kyP(Own-iN#Z From b73006e3b833d35256a7229f19df4aabd881ffc6 Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sat, 26 May 2018 12:34:57 -0700 Subject: [PATCH 3/9] attempting mac builds --- .travis.yml | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index cd493f0a2..62a9129ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,18 +36,29 @@ matrix: python zlib1g-dev wget bsdmainutils automake libssl-dev libprotobuf-dev protobuf-compiler libdb++-dev ntp ntpdate mingw-w64 wine bc" KOMODO_EXEC_SET="src/komodod.exe src/komodo-cli.exe src/komodo-tx.exe" COMPRESSED_BUILD=Komodo-build.tar.gz + - compiler: ": Mac" + os: osx + osx_image: xcode9.2 + env: > + HOST=x86_64-apple-darwin11 + TARGET=x86_64-apple-darwin + BSCRIPT=build-mac.sh + TRAVIS_OS_NAME=osx + PACKAGES="binutils protobuf autogen" + OSX_SDK=10.9 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 [ ! -d "$HOME/google-cloud-sdk/bin" && $TRAVIS_OS_NAME = linux]; then rm -rf $HOME/google-cloud-sdk; export + CLOUDSDK_CORE_DISABLE_PROMPTS=1; curl https://sdk.cloud.google.com | bash &&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 = osx ]; then brew upgrade python coreutils automake; fi +- if [ $TRAVIS_OS_NAME = osx ]; then travis_retry brew tap discoteq/discoteq && brew install flock; fi +- if [ $TRAVIS_OS_NAME = osx ]; then rm '/usr/local/include/c++' && travis_retry brew tap homebrew/homebrew-core && brew install homebrew/homebrew-core/gcc@5 --overwrite gcc@5; fi +- if [ $TRAVIS_OS_NAME = osx ]; then travis_retry brew update && brew install $PACKAGES; fi before_script: - unset CC; unset CXX - mkdir -p depends/SDKs depends/sdk-sources From 2a023e3c45ef425e78fea8a398d7252a53c22e90 Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sat, 26 May 2018 12:35:29 -0700 Subject: [PATCH 4/9] attempting mac builds --- .travis.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 62a9129ea..136f69371 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,20 +22,20 @@ cache: 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 - 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="src/komodod - src/komodo-cli" COMPRESSED_BUILD=Komodo-build.tar.gz - - 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 - 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="src/komodod.exe - src/komodo-cli.exe src/komodo-tx.exe" COMPRESSED_BUILD=Komodo-build.tar.gz +# - 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 +# 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="src/komodod +# src/komodo-cli" COMPRESSED_BUILD=Komodo-build.tar.gz +# - 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 +# 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="src/komodod.exe +# src/komodo-cli.exe src/komodo-tx.exe" COMPRESSED_BUILD=Komodo-build.tar.gz - compiler: ": Mac" os: osx osx_image: xcode9.2 From b247a9f575fbb35063d9b2588960a7ca9e14c369 Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sat, 26 May 2018 12:40:19 -0700 Subject: [PATCH 5/9] attempting mac builds --- AUTH_KEY.json.enc | Bin 2352 -> 2359 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/AUTH_KEY.json.enc b/AUTH_KEY.json.enc index 2ef6245d853e98605dc1d1a0f39906a5ea9c6c4f..6d9d8225a2fb381df6077d8a3bf8c5950e2a8ec5 100644 GIT binary patch literal 2359 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 z znEQ;!`!)RD9c1~ZMK)K*z( z3l50d7RZ;B4`V+h=?R4Ax4%2ZfLjz~fNF82asge;z;>~dHX9C2rzpG{3Yu(by^;eQ zr-qnK&rq2?A|6Uugl*^|okKt&aP*$IWYejaiOU1@Ns%>O(Z}a&oe=W{9r}3;l!Z?_ z`jU&nOwV)&*7Jc|zIIjQZtmL(EBZ^m5d6+st2NbyLzvPXBYm68k!|s|y+PK+BKB%b z7zJOzycpo~o^6Gj2NGyfA@8>@4RC`qVR$pd@)rC2F}DnyfG-d@yHn&7LQ7ts>ux*o z(x}#8kc#H1C~{@$?bS2PJzU^IQ2V8^q*i! z<~Q-tdysU~wo2+!oQZzZl8W%q!Fw_~1zaX)!aK0??>kFi;dr<@wi_-;O@EQztRd-J z2UXX+xWs0(sm&^TL@(X^gikF&GGjuDSu!C4^^=_bx*g`k? zC)R$9vTPJce1eH~1gW44S^9`Rkwu;I9WV9og5jev$bXPx^^E29UQ@dnAzxKyyXJV; zOP=OuC3Wq*cLMf1+i!rK8d7x z$AfgHkKA-}9HBXHZO3u~i+O4sD#%yTLsbxs{J|3PP>qjorsj?Url66~94@!2>gpAT W Date: Sat, 26 May 2018 12:43:19 -0700 Subject: [PATCH 6/9] attempting mac builds --- .travis.yml | 45 ++++++++++++++++----------------------------- 1 file changed, 16 insertions(+), 29 deletions(-) diff --git a/.travis.yml b/.travis.yml index 136f69371..793392aa1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,43 +22,32 @@ cache: 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 -# 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="src/komodod -# src/komodo-cli" COMPRESSED_BUILD=Komodo-build.tar.gz -# - 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 -# 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="src/komodod.exe -# src/komodo-cli.exe src/komodo-tx.exe" COMPRESSED_BUILD=Komodo-build.tar.gz - compiler: ": Mac" os: osx osx_image: xcode9.2 - env: > - HOST=x86_64-apple-darwin11 - TARGET=x86_64-apple-darwin - BSCRIPT=build-mac.sh - TRAVIS_OS_NAME=osx - PACKAGES="binutils protobuf autogen" - OSX_SDK=10.9 + env: 'HOST=x86_64-apple-darwin11 TARGET=x86_64-apple-darwin BSCRIPT=build-mac.sh + TRAVIS_OS_NAME=osx PACKAGES="binutils protobuf autogen" OSX_SDK=10.9 + +' exclude: - compiler: gcc install: -- if [ ! -d "$HOME/google-cloud-sdk/bin" && $TRAVIS_OS_NAME = linux]; then rm -rf $HOME/google-cloud-sdk; export - CLOUDSDK_CORE_DISABLE_PROMPTS=1; curl https://sdk.cloud.google.com | bash &&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 [ ! -d "$HOME/google-cloud-sdk/bin" && $TRAVIS_OS_NAME = linux]; then rm -rf + $HOME/google-cloud-sdk; export CLOUDSDK_CORE_DISABLE_PROMPTS=1; curl https://sdk.cloud.google.com + | bash &&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 = osx ]; then brew upgrade python coreutils automake; fi -- if [ $TRAVIS_OS_NAME = osx ]; then travis_retry brew tap discoteq/discoteq && brew install flock; fi -- if [ $TRAVIS_OS_NAME = osx ]; then rm '/usr/local/include/c++' && travis_retry brew tap homebrew/homebrew-core && brew install homebrew/homebrew-core/gcc@5 --overwrite gcc@5; fi -- if [ $TRAVIS_OS_NAME = osx ]; then travis_retry brew update && brew install $PACKAGES; fi +- if [ $TRAVIS_OS_NAME = osx ]; then travis_retry brew tap discoteq/discoteq && brew + install flock; fi +- if [ $TRAVIS_OS_NAME = osx ]; then rm '/usr/local/include/c++' && travis_retry brew + tap homebrew/homebrew-core && brew install homebrew/homebrew-core/gcc@5 --overwrite + gcc@5; fi +- if [ $TRAVIS_OS_NAME = osx ]; then travis_retry brew update && brew install $PACKAGES; + fi before_script: - unset CC; unset CXX - mkdir -p depends/SDKs depends/sdk-sources @@ -74,9 +63,7 @@ after_script: && cd src && tar -czvf $TARGET_PLATFORM.tar.gz $TARGET_PLATFORM; fi - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gsutil cp -rv $TARGET_PLATFORM.tar.gz gs://$BUCKET/CI-TESTS/$PROJECT/$TRAVIS_BRANCH/; fi -notifications: - slack: - secure: A7JtO9RXl0Tgx09IWwUKbCuZ0oTC4wM4jthsV2CW3AS7r5Iz1qMFBnb7sb8744f40vi/QYjbr1KHkdOEbSJqWzOJS7oelSM9kyck808un7zZ8OwweXdGqdirNmIR3x+IQAYZw2lvYZcUBX/5h8eXK2LU67Rsve5I1WRGPtz0rmctFeRG6Xe0yGpMDYYxt4Ce/L7N5h3cC2eak8pQU6mSyQog0yvbiM73CFzz//bWughamOHKLx6o8BDgklwuCuh4rHQe/0kwVq1AoPQMqxuKQTsGAmub4mrDcsde39h3uo4GjAqAgfmL2e4hyp8fumdd7BtrQaFF4UBqyR8Xo/Ao97Ca7Dbeii5Eq7sl5/sTxZRdjy+MFD7z+jFpLkXfivBradyu0jABT5YYYMzZOCkpOGl5l3YymT86HKO5RBHyZLNL06jxHLti3NYBvFC6C+0yZrJOo7KN9DMqHHLZ5Y3ASZqbARWlVDE4oQmauyn4X2d6EOoE7ohwHwpY/LbVNFmrGvD+jAf4dOttwCMoWnT2pLWzs8Tl4FrvDGR3tbmZSCR/0NfbbeGrv9YNJtUghjubp1OikaZ3/Hs0+yJVsKo3kVd+dZvT/5u9MD6bu/cSdBRnoG0orca9QB8obaTEQ+71XC63D0hwDoZ9IgX6qVv+3KFErHZdZGiQBZI2yXSckvI= before_install: - openssl aes-256-cbc -K $encrypted_80a07e64c04e_key -iv $encrypted_80a07e64c04e_iv -in AUTH_KEY.json.enc -out AUTH_KEY.json -d + From 987b65957e93622a254ff46d7b026e9bd6bfc1da Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sat, 26 May 2018 12:45:29 -0700 Subject: [PATCH 7/9] attempting mac builds --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 793392aa1..1ce754c95 100644 --- a/.travis.yml +++ b/.travis.yml @@ -63,7 +63,4 @@ after_script: && cd src && tar -czvf $TARGET_PLATFORM.tar.gz $TARGET_PLATFORM; fi - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gsutil cp -rv $TARGET_PLATFORM.tar.gz gs://$BUCKET/CI-TESTS/$PROJECT/$TRAVIS_BRANCH/; fi -before_install: -- openssl aes-256-cbc -K $encrypted_80a07e64c04e_key -iv $encrypted_80a07e64c04e_iv - -in AUTH_KEY.json.enc -out AUTH_KEY.json -d From 85b0e3fd9404dc493aff7b7bcc4f84e86c84898a Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sat, 26 May 2018 12:47:55 -0700 Subject: [PATCH 8/9] attempting mac builds --- .travis.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1ce754c95..7956aef3a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,10 +32,6 @@ matrix: exclude: - compiler: gcc install: -- if [ ! -d "$HOME/google-cloud-sdk/bin" && $TRAVIS_OS_NAME = linux]; then rm -rf - $HOME/google-cloud-sdk; export CLOUDSDK_CORE_DISABLE_PROMPTS=1; curl https://sdk.cloud.google.com - | bash &&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 From 78a27c22525c45dd7fd44e49088cc9eccb847f85 Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sat, 26 May 2018 12:53:18 -0700 Subject: [PATCH 9/9] attempting mac builds --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7956aef3a..0b9f1bcc8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ matrix: - compiler: ": Mac" os: osx osx_image: xcode9.2 - env: 'HOST=x86_64-apple-darwin11 TARGET=x86_64-apple-darwin BSCRIPT=build-mac.sh + env: 'HOST=x86_64-apple-darwin11 TARGET=x86_64-apple-darwin BUILD_SCRIPT=build-mac.sh TRAVIS_OS_NAME=osx PACKAGES="binutils protobuf autogen" OSX_SDK=10.9 '