From 43f58a2e4ada3c309fbc5027a4aeb8e518d7f567 Mon Sep 17 00:00:00 2001 From: Igor Artamonov Date: Tue, 19 Mar 2019 19:06:51 -0400 Subject: [PATCH] problem: no binaries deployed --- .appveyor.yml | 68 ++++++--------------------------------- .travis.yml | 1 + deploy.sh | 6 ++-- gcloud-appveyor.json.enc | Bin 2336 -> 2320 bytes 4 files changed, 13 insertions(+), 62 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 0e5fcc8..97dc14e 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,64 +1,15 @@ -# Appveyor configuration template for Rust using rustup for Rust installation -# https://github.com/starkat99/appveyor-rust - -## Operating System (VM environment) ## - # Rust needs at least Visual Studio 2013 Appveyor OS for MSVC targets. image: Visual Studio 2015 -## Build Matrix ## -# This configuration will setup a build for each channel & target combination (12 windows -# combinations in all). -# -# There are 3 channels: stable, beta, and nightly. -# -# Alternatively, the full version may be specified for the channel to build using that specific -# version (e.g. channel: 1.5.0) -# -# The values for target are the set of windows Rust build targets. Each value is of the form -# -# ARCH-pc-windows-TOOLCHAIN -# -# Where ARCH is the target architecture, either x86_64 or i686, and TOOLCHAIN is the linker -# toolchain to use, either msvc or gnu. See https://www.rust-lang.org/downloads.html#win-foot for -# a description of the toolchain differences. -# See https://github.com/rust-lang-nursery/rustup.rs/#toolchain-specification for description of -# toolchains and host triples. -# -# Comment out channel/target combos you do not wish to build in CI. -# -# You may use the `cargoflags` and `RUSTFLAGS` variables to set additional flags for cargo commands -# and rustc, respectively. For instance, you can uncomment the cargoflags lines in the nightly -# channels to enable unstable features when building for nightly. Or you could add additional -# matrix entries to test different combinations of features. environment: GCP_PASSWD: - secure: GiLB9xoSis0z90cMZO88dhWAhRYpXI65mTuYYQsEOdnf+R1CZkuptKRB6mhdEbDliHu6jGWdW+7A6rpYmmTgpYuXcijONGn8mfXHenW7k48= - - matrix: - ### MSVC Toolchains ### - # Stable 64-bit MSVC - - channel: stable - target: x86_64-pc-windows-msvc - # Beta 64-bit MSVC - - channel: beta - target: x86_64-pc-windows-msvc + secure: /kPjA5Ff2c6ZDhU7y6TiUWiR4Jr4uXyLKWan35EXXTI= -# Only build against the branches that will have pull requests built against them (master). -# Otherwise creating feature branches on this repository and a pull requests against them will -# cause each commit to be tested twice, once for the branch and once for the pull request. branches: only: - master ## Install Script ## - -# This is the most important part of the Appveyor configuration. This installs the version of Rust -# specified by the 'channel' and 'target' environment variables from the build matrix. This uses -# rustup to install Rust. -# -# For simple configurations, instead of using the build matrix, you can simply set the -# default-toolchain and default-host manually here. install: # Install janus. - set PATH=C:\msys64\mingw64\bin;C:\msys64\usr\bin\;%PATH% @@ -72,7 +23,7 @@ install: - appveyor DownloadFile https://static.rust-lang.org/rustup/archive/1.7.0/i686-pc-windows-gnu/rustup-init.exe -FileName rustup-init.exe # Currently broken version. # - appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe - rustup-init -yv --default-toolchain %channel% --default-host %target% - - rustup-init -yv --default-toolchain %channel% --default-host %target% + - rustup-init -yv --default-toolchain stable --default-host x86_64-pc-windows-msvc - cmd: set PATH=%PATH%;%USERPROFILE%\.cargo\bin - rustup update - rustc -vV @@ -83,7 +34,6 @@ install: - cmd: set RUSTFLAGS=-C target-feature=+crt-static ## Build Script ## - cache: - '%USERPROFILE%\.cargo' @@ -91,7 +41,8 @@ cache: # build commands. Rust will automatically be placed in the PATH environment variable. build_script: - cargo build --all --verbose --release - - 7z a emerald-%channel%-%target%-%VERSION%.zip ./target/release/emerald-vault.exe + - cp ./target/release/emerald-vault.exe ./target/release/emerald.exe + - 7z a emerald-cli-win-%VERSION%.zip ./target/release/emerald.exe # Uses 'cargo test' to run tests and build. Alternatively, the project may call compiled programs # directly or perform other testing commands. Rust will automatically be placed in the PATH # environment variable. @@ -100,13 +51,12 @@ test_script: artifacts: - path: '*.zip' - name: emerald-vault -before_deploy: - # Set up GCP upload. - # - nuget install secure-file -ExcludeVersion - # - secure-file\tools\secure-file -decrypt gcloud-appveyor.json.enc -secret %GCP_PASSWD% -out .gcloud.json + name: emerald-cli + deploy_script: + - openssl aes-256-cbc -d -in gcloud-appveyor.json.enc -k %GCP_PASSWD% -out gcloud-appveyor.json -md sha256 - ps: >- If ($env:APPVEYOR_REPO_BRANCH -eq 'master') { - janus.exe deploy -to="builds.etcdevteam.com/emerald-vault/$env:VERSION_BASE/" -files="./*.zip" -key="./gcloud-appveyor.json.enc" + janus.exe deploy -to="builds.etcdevteam.com/emerald-cli/$env:VERSION_BASE/" -files="./*.zip" -key="./gcloud-appveyor.json" } + - rm gcloud-appveyor.json diff --git a/.travis.yml b/.travis.yml index 0ca790d..5cacdeb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,6 +37,7 @@ script: - cargo test --all --verbose - cargo build --all --verbose --release - cp ./target/release/emerald-vault "$HOME/.cargo/bin/" + - cp ./target/release/emerald "./target/release/" - bats cli.bats deploy: diff --git a/deploy.sh b/deploy.sh index 4fcefb5..771b027 100755 --- a/deploy.sh +++ b/deploy.sh @@ -1,14 +1,14 @@ #!/usr/bin/env bash VERSION_BASE=$(janus version -format='v%M.%m.x') -CLI_ARCHIVE_NAME="emerald-vault-$TRAVIS_OS_NAME-$APP_VERSION" +CLI_ARCHIVE_NAME="emerald-cli-$TRAVIS_OS_NAME-$APP_VERSION" zip -j "$CLI_ARCHIVE_NAME.zip" target/release/emerald tar -zcf "$CLI_ARCHIVE_NAME.tar.gz" target/release/emerald -echo "Deploy to http://builds.etcdevteam.com/emerald-vault/$VERSION_BASE/" +echo "Deploy to http://builds.etcdevteam.com/emerald-cli/$VERSION_BASE/" mkdir deploy mv *.zip *.tar.gz deploy/ ls -l deploy/ -janus deploy -to="builds.etcdevteam.com/emerald-vault/$VERSION_BASE/" -files="./deploy/*" -key="./gcloud-travis.json.enc" +janus deploy -to="builds.etcdevteam.com/emerald-cli/$VERSION_BASE/" -files="./deploy/*" -key="./gcloud-travis.json.enc" echo "Deployed" \ No newline at end of file diff --git a/gcloud-appveyor.json.enc b/gcloud-appveyor.json.enc index e4001bc31819e984c7a02f017282a037715473df..ea1a841cdc1fc3f4fddb5c88a0bbdadd8325f6e8 100644 GIT binary patch literal 2320 zcmV+r3Gen(VQh3|WM5w*`?4SE`yhco(tv^4`L9DdZdDy9KPL%4+x=mmVo;bDnh+D+ zsXEa%-l~;qLEKTTOg_Lo4;@!V5>iy&LB8rsAulQz+DG4;OQo5#ts;d9*%y76?kkW2 zs(K&}!CQqWm&C@9K2Z15AWn@%PqmBz28FSkc-l~{rtXZ40>8Q=YVYY}KOSPTM(gZf0;kELRv%r+i^GS7)})p;;mGAwB@d5FlJmNk4~`-Kl-Mj#Mkr^nh2fTgqRLUE z>EPqcp&-D_ahSAy76PptaOol*zsftKfV?Eh%h9K*Yv#XMNzvjodC+6_cSve2U{c1G zuf2Llkzt+QIyK1X~GWhjB%Y z7K(oHzx}#j?j(38mJR5Gfm8-hwmNN^+aifkMe)jl%QRmM^ref&$a9=6P^5WJ=3|34;KGYbP-h!_G z&nh4`n4T#nY+J3SE6ziYAF#$GY{|OW$y8a+T8DP9rO*&@hXh8z14f=H+8XnX#1o9* zss86;??p;F1|$GnulUqziU&(>gI$78)WwFrf~S0)d7-$ew&wWBQ|^(JC)GQ{a1!L3 z^+e@gVA6EpWZa%rE*@B-i;rW(5`90{wdSG`4V;Aj;mXlZlZ0T}+lm!?>221iq^$@+ zX+Q#G>P1;Pn(!z(ZDs=yOv73h*n4jF!JZDH_mbEmdh*+Tv|Tj8>Uu#3h8z>1pN5p; zKPHMXhL!uRP{;NSlg<1BF&>S!sU%WImK0Jgo}1IOdq%2KDlcT8+ao8Tn^HrgxnR0& zlZ|~`~p0N!|LQ0GNen4xk zuetydzze8z^5NfAXv!B)N5Hfh`V_kUNkvK$oHhzU{@F!y#(w(5HogLNwHnyvH5Wgl zKiH>~yK33TU1Hn>9v_@H!p|Db!@bV-G3>nyC4;9;&A7m0_vFzg@b zQH}Fjc;QQ!kP<0L&)@!f^P(B~%3Ch&3CQEHk2S#qgXy{e$#+Ka!|pB=<;2=drj`fO zMf;m0RZ=?Y`ZAuttKj|eID+bs{||Ba2yVgZ&apq~-hL4n`)BRG$Him#fU|v4J?K;$ zS$2LBkO2iX5SZ-mdCoL}9Op~k?sVM*`=>Gqgt0{kG{H3y6$D%5!U4{ugdO?YzxG z02P3H`xYyMa-SC3LXj8A#R&{c)^Gw8T!HQ0`6DfZo=FfV7GCArYcPd#d z2Q4cE!jCN;B~I)SKvd1z36GBk&>PUKJFX+OLKUej5rrxpYK1L1{>*=e*)d+7uT==# z9u6h9B!>IhovF~3#eaevI<&?iD@}0b_tsNDWM;-w8EGXakRK@z zew~f5@IKTyFz_Eo4ZJa;2LH_HL$x#pe;k*X1)SY&*5QSQ8%Pf;0;KZx z*7>ZT=d60Lkv*%9S~+yx#Ekq{zlb(A7p@#gE*a0N*irW$LF}^tpo+D>r&wW49kvWPxlEi1)J&KX$+CYb z@rp-pfDa$S>4!{lHuO_7fm*4hz_x1J#pm)?U@y=Ut?Nn5R>lS5^M618!`FVPQU(to zO5;OHBNi!Y)0FUvygOL1-z}k+F*3YO>!ox$N%1UVu5vIV5Blnn zNY%(m2pECx1Xj_UamtRT=~$hGe594a2SlGOJOXGIxOiR|28<0%&gGC5wGw*>Yq<_6 qGNM(Vo8}uMSlZOFh_gkOKz1}FBz+Xv%|*X)A3FJ@WN=A(5@!{Y9eOSR literal 2336 zcmV+*3E%cpVQh3|WM5z1m6BM1XVDtr#8od@vZ3oi-kzaSpK*H9pZrL5;nFd?F8{h| zp<2H5FsxswL47RN`gmMMLd_3=oi2La=nb524+R$?zKK#@qgSxEj-^qh)RGyLWBpaW zafFa#uK}vO0JA(f-@;C#&Tm&E(0kDFNHjaLz9{@^N^MOY7uaku)Px_MI0iz@I6KGi zRXZ~rrF0z&YysAO5jDRT(N!~vHBFFE{4VX|AS^HniKOVq7p2N?J;`k~s-Oon z)+pLaYnjr3rchX2MthR?@_Y1_P^9jzRbKBRaX#F@3ER(a`0F!h%^dIsft|HgN+PlX|baP_%SU@%Sh@sZb7|<=P~+j2eZ39@&=@AdGh$+w(s%5l2mGM z{>H2tWFn1(g-yUXa>-^__R%99QN{Yh(L=g4T|tF$`1t(lgEJik3tO)JEGV7r*OLzr;7L6NSrj|&-W=|YsW3r zzjH{K#;5pGUo#14^TaA>x_lYjA7Y@9cWJfJK?v+9;_UnFDU+lYdEl0#>BZ)RmBsy6 z{8ml~$T?qJ_p7-)-)cgxqhL&gP`DHfvI)Rp=XiFtey ziXcvzds)i^_jx(4zb9nr2JGu?7<+M!tN~inB}Hwg^-#WqIY`0_mNZp@ivzXat`Ec5 zCE5u8mR5Cp3KW;mDrtZ-o)pUi>L9sHH-B|dwh5xUdph?jNvhFl+?;Z1!;_& zLDRF_5L86!0P0`Fj&sNuaaw2EW*@-dZcay{oItB*U+7<24PTVrge8 zILm`33W>2cFh>kgDUwd+DR#9-$0xZT^*jn#+UwVk(7E$g-yAv{(EbyL z$?M^l38$N8eho&U{NtvJVis3OL8bP{@LP#XsGh(EuLfO@$V*eDbl;Y(-kt!Y&L11q ztcyrZmz9M3HZq}lMXY6yGZ zo3RMs76jfU+Kq<@>Y7iVn;a-T>OsQzs!if2@%oqARl&-WC_0T#p;{C;u;5^ltVpR0 zc@jJ@w5_!cGgv{x_KYv}2ALp6^Il^W93A_7+;9&c^3DiB~4W7#Iz<`;V@H5M%Z6Tux z&0gcM3F+mqR?^nK3vU!P$YWAJXA$(R2$-w*oRdyDm3eop6am8 zipp9}Ar7G~#0KQvU_ zLbo94Zcz-M0+sfKDhJ|`V#6i34i;s2??X0HV+$?)_;YS*G*lf%@)h#~4CVhH?rWSS z$gQ*MO1A(GxQn5yKrA|rB5pjNr3RdDcKCGv{X44k`pK>uHJf7asWukFK`J!d&jtD( zf{VCN!4_FCgGGIhKSkf?2^3oZpvxg6Y!$}v-*re_!cLcc$kH9QXnCn4Yzv2#8L&v= zEQsVZ4F;}Gz-4S~N7$mJ`rycMx7~vsjUqbiusy%dNM@C+tTmPB2fh2=Vb@Xjha^CV z?QaP8-_251Y0;wsump6UT#x8lNGnC}erLeYn>rqaMoJEXCf}AkeFy8$drX*nGv9{^hfBpv>voi6IG}|CD17H%)suZZYj6p;P$&bs1xqNN&YjALWgJzXIBx?9EOwfl~WEaB_Bz0+5 z`<zG03bX1rM_Y~YYeA%FGqb`dfp)L%C4Zj@u`Y-P3eWJ5}w!Hy1FKMT0v zHmxnX!0lAc6DOoW+}}_ZiU#60ya6k!RyeL z?8V6#g618Y;tlEOc0F>!v8{A({%*2sCUIM~(&=6##q5ZBv!Vs12hEGcuH><;x!; G(vp02&WacS