From 566539e37db43082bfa1ad83f2c4dc204beea75e Mon Sep 17 00:00:00 2001 From: Vlastimil Zeman Date: Mon, 19 Mar 2018 11:09:30 +0000 Subject: [PATCH 1/3] Add encrypted GCloud key for Travis This key will be used for uploading doxygen html documentation. --- .travis.yml | 3 +++ gcloud-travis-cbmc.json.enc | Bin 0 -> 2336 bytes 2 files changed, 3 insertions(+) create mode 100644 gcloud-travis-cbmc.json.enc diff --git a/.travis.yml b/.travis.yml index 48d29fea89b..de8f1f0f2c8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,6 +47,9 @@ jobs: install: script: scripts/travis_doxygen.sh before_cache: + after_success: + - openssl aes-256-cbc -k ${GCLOUD_TRAVIS_CBMC_KEY} + -in gcloud-travis-cbmc.json.enc -out gcloud-travis-cbmc.json -d # Ubuntu Linux with glibc using g++-5 - stage: Linter + Doxygen + non-debug Ubuntu/gcc-5 test diff --git a/gcloud-travis-cbmc.json.enc b/gcloud-travis-cbmc.json.enc new file mode 100644 index 0000000000000000000000000000000000000000..63c9c19b9774ee92428fefe12bdf962a2a0715b3 GIT binary patch literal 2336 zcmV+*3E%cpVQh3|WM5wy=F3W*W#K0Mjd6RL>UQ!AG}ztw^@q^m#=hNd*DEKbOaT8Q z>UsUXZ8o)557a3Sra12%<#mQf~IZ=JorY)m=jQd8g(Hu&3VdP-qL?bxM= zq`=l}kzLwAr8e%-$w9wZg)ta>Y~h$-vC|`bFZm7etBh+baUP_-Vl#XN-GA2E=?O{9 z{>|@}n0TjNuiF6GhT8Mm67)J(b?#5D^VYzyn;!glL#^>=YLmkKh)L6Ymp;XE*X5|H zs?AsWCjj$*(q+K>8J%%kiH;$`O6Fr0F-+>E?+jE#BHCj*EAAgq#i$9oX}B#bf}V)_ z=x{OLu$}94BrQ9@RmJ74z|-m9kJZDl*D))55SSVNe;? z1p>58Lhv%uKjy_oX&20L0QB)PFbUPX=3Z=($3yMk<*;wn>oiMPU|Db6%aS7mi|A&* zC;gDCfmMj$h)BdcgOq@4ygp5rZ`YZJbhAsxqR6PdwD&6Sb?#jxjZvPg$p`p6e-rh5U(xIrO=%hHq!AlxA4&s8L z*it26l@*`PGan7S{7X8)&mcBD8Fj z!kgrfl`U7j<^aI;*d2N{6>X~Yd73=0-LNO&klumf=kQ!bKh3zEhr$i{|H@&+fSZ_?DwUnF+RIMIXE^77@-xZ;jj);eqMI~tLs_Y2apH!LgPD(CLg z#jZL&G#|laImc_=`-&BTR~=^f9~0pWpe#%ZEMzH!y?&D$nEMF4!_#up9J&H=eoI7)<9SkH?)-#vaJ#2!JnS6d2LI=YNT?;KN~^D(G_W-e z4>Q5Nv5pxCnXhQ`tFcipU_!Fa|1RFLOox~qUmp+KlJ8ALKVR$x*UVMlyYd|VOB#RS z)$tVE*zEUGQAu4@V{n(Wjz)Ev&xpCE^m#;d{0J=8O4@@4Clg`i)Ir ztwyGX6qXM+ZGC(z*o7-GnLNr2B}HcDkal#ZP?C<2cfS<|>}f0zN0>Wg z&;Fcr_DS7b0EoTUVHkpCb@kI92<9T#2{-(x1J}LnW`MHdx>j}{0nR>Pj{4|sl-Qy~ zI0zBsJA9<^(SjWMzPF{dG?CO=2gHdCR?>-@NrB$;M+oRrcUN}z?(A_r5f9Fk;d|L1 z2rmkKSMY4Ehl*kWBqKQ{d*vj(tl?t}D%S#l74=&x75$#B`rZsCsb39E)Y^f0iCe`& z4_n{8glSv1;7B$|oC4GjU6rwTU#&0m5fdjdJ*> zD8TZ!PUJQiMw>tElaU(oYxmTa+*evZLZcdfjWR~xZfK=)FH12#3=-rIy>WWk8T_!Q zF?K%=HI=;x>z`Fzv|o3PBu=J$!JJYG1}D$X`DbEtwu+l$A%eH;Y(=NzkEP|@e6X=* zM8L6?9_HGzdC`~hpu^3m)tOt%esr_2?iI3L8&cJ~hVzo$M`bWo;b+#=gj!ngslRUv z1iFlJE(Me^y@*Gm1$1_e*2O4s2?XuZey=*!Qo8A!a^O-Gr>G=afRfOkjUR`oxcdTb zMxPn1rUZIxv!4^PqY~r_T>QHc;GyxKKIa=8MdW6)caw*Jz-Cw;j$8wSIZFjq#^4yn zf?N7jM8fkjMj}5~>GvrEezFg5ncM)I>Kew}ClRe^7r>~j(FkWGVLft^`u||a z;yuK6V&T;DhB3{_3CU4~kM|z#FKmL28)ZX0NEK-06q?!m75>?TmFH4cg1y+5kc@_m Gk7c`|K$oik literal 0 HcmV?d00001 From a5c26a80227efe3166e1e3000b5d0cb8aa72c7ee Mon Sep 17 00:00:00 2001 From: Vlastimil Zeman Date: Mon, 19 Mar 2018 15:31:57 +0000 Subject: [PATCH 2/3] Add script for uploading documentation To keep it as fast/current as possible we will use rsync that to upload only changes and delete what is no longer part of documentation. --- scripts/publish_doc.sh | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100755 scripts/publish_doc.sh diff --git a/scripts/publish_doc.sh b/scripts/publish_doc.sh new file mode 100755 index 00000000000..aa25891806f --- /dev/null +++ b/scripts/publish_doc.sh @@ -0,0 +1,37 @@ +#! /usr/bin/env bash + +# Copy doc/html to Google Cloud bucket cprover.diffblue.com + +set -euo pipefail + + +#### Variables + +#User-defined variables +DOCS_FQDN="cprover.diffblue.com" +DOCS_GS="gs://${DOCS_FQDN}" + +# Path to generated HTML documentation +DOCS_PATH="$(dirname "$(readlink -f "$0")")/../doc/html" + +# Colors for nice output +GREEN='\033[0;32m' +#RED='\033[0;31m' +NC='\033[0m' # No Color + + +#### Deployments + +# For develop branch +if [[ "${BRANCH:-null}" == "develop" ]]; then + + echo -e "\n${GREEN}Uploading ${DOCS_FQDN}${NC}\n" + # Copy HTML docs to gcloud + gsutil -m -h "Cache-Control:public,max-age=60" \ + rsync -r -d -c "${DOCS_PATH}" "${DOCS_GS}/" + echo -e "\n${GREEN}${DOCS_FQDN} is live${NC}\n" + +# For all other branches +else + echo -e "\n${GREEN}Nothing to upload in >>${BRANCH}<< branch.${NC}\n" +fi From 2fe999c4313b836e7d5ce5f438529e4ab7d292ab Mon Sep 17 00:00:00 2001 From: Vlastimil Zeman Date: Mon, 19 Mar 2018 15:33:26 +0000 Subject: [PATCH 3/3] Add gcloud integration to Travis And publish documentation in case of successful build. --- .travis.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.travis.yml b/.travis.yml index de8f1f0f2c8..52d548e3de2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,14 +42,24 @@ jobs: env: NAME="DOXYGEN-CHECK" addons: apt: + sources: + - sourceline: 'deb http://packages.cloud.google.com/apt cloud-sdk-trusty main' + key_url: 'https://packages.cloud.google.com/apt/doc/apt-key.gpg' packages: - doxygen + - google-cloud-sdk install: script: scripts/travis_doxygen.sh before_cache: after_success: + # Google Cloud Integration + - export BRANCH="${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH}" - openssl aes-256-cbc -k ${GCLOUD_TRAVIS_CBMC_KEY} -in gcloud-travis-cbmc.json.enc -out gcloud-travis-cbmc.json -d + - export G_KEY=${PWD}/gcloud-travis-cbmc.json + - gcloud auth activate-service-account --key-file ${G_KEY} + + - scripts/publish_doc.sh # Ubuntu Linux with glibc using g++-5 - stage: Linter + Doxygen + non-debug Ubuntu/gcc-5 test