From c46a5d764cad9502c53608659f5b96478be635b9 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sun, 17 Jun 2018 23:36:31 +0100 Subject: [PATCH 01/25] Try and get CD going to gae --- .gitignore | 1 + .travis.yml | 7 +++++++ peter-ola-rdm-app-51be81f8c2c3.json.enc | Bin 0 -> 2320 bytes 3 files changed, 8 insertions(+) create mode 100644 peter-ola-rdm-app-51be81f8c2c3.json.enc diff --git a/.gitignore b/.gitignore index 5c1958f8..50155cea 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +*rdm*.json *.pyc *.swp node_modules diff --git a/.travis.yml b/.travis.yml index c1d6e99c..a67748e1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ cache: sudo: false before_install: + - openssl aes-256-cbc -K $encrypted_7eede60d6b12_key -iv $encrypted_7eede60d6b12_iv -in peter-ola-rdm-app-51be81f8c2c3.json.enc -out peter-ola-rdm-app-51be81f8c2c3.json -d - if [[ "$TASK" == "spellintian" ]]; then sudo add-apt-repository ppa:waja/trusty-backports -y; sudo apt-get update -qq; sudo apt-get install lintian -y; fi # Install a late enough lintian install: @@ -75,6 +76,12 @@ matrix: script: "bash -ex .travis-ci.sh" +deploy: + provider: gae + keyfile: peter-ola-rdm-app-51be81f8c2c3.json.enc + project: peter-ola-rdm-app + skip_cleanup: true + notifications: irc: channels: diff --git a/peter-ola-rdm-app-51be81f8c2c3.json.enc b/peter-ola-rdm-app-51be81f8c2c3.json.enc new file mode 100644 index 0000000000000000000000000000000000000000..7e89b480524658be55acb1bee39cba8dd5544e4f GIT binary patch literal 2320 zcmV+r3GenD^JDx9H+g!%Db0Mm7!f!X5$=jUWHb^@?ze$^Mz^I8H4=+?sr;E9>!$Uw zIfD!+;4ha(F6KatodxO%&PkD?&J2xqfJMN*qU@q&-XVB8(EV>oH*< z*5{%6Vuoq(H8F!3^6M3$%PsxR?=uk!cJ(tCHhh$xEwX#pJMg!pdu~HkpPO>ZtIk$B zxjF(7v6k0%vU{8n+=`~pd88Pqp(lbZJ_7j@|#ZPcd{OAx%BFh7EhQH=|cx z-DY?TpHKH)jOXtxTL4Mf<7u-hRbUamgsM)B_V)W8iP~ z?pfeosz=T6z(}9(3#md(#8H-CzS|w1m&|}Px{8wE#Ljvhn6=PDuD2($ywleA@~R;9 zH>xX^^_zIuOxwMrr0Jb^jMrFW?A=shk*qO8VY2jja&JA9dK{ef-lm;6EWSj{Dqj_M zXEc8Mu!xZujbFNrM}9@xDb|lCUL=2UT6fDP>;3N7)mSs{LU#b2VUSQ{fxomH>$G9v z&s7NqvNm?$n{qszX9FoH=f~R#@zHbYv79Qp- zkR5#AX_&HiIS~TysN>t;FN10;H~u0>ggEo2u2;I(!iE{p_n(c`U{|1eP;>HcK*#atD=v3D0q8K z=Jz&=vEp~A;(+{CI5AH{xc9*uA zY%cG(UtW;58lm2kXT^dM*xGpwg8$FA!Cjh+AM8_!fhH)w0ZS5i()>9ae6k6(FzB_EA_+5U7w`t7!c zp))2A4uzQ7_D661(a_D@SvO0WzA&R&#-&K0sCEO;vjvf>JZC&UkQq51OqTP zT1qoD@Sn6t^S}vWhPsBSFyI#&!ha-Ky7|nR{Tj++A%ev~DdC3;Y}u#axh=bgU8%!M z7VE78CgLF9zr%74*Z5OtXA>V`Ze=Id&VQU}17yvAe?Le+Kv+=Jc(y^LLB$^75xzbU zTJfdg3tOp93L9e`01VT(c`v1yqjsM*E6nMNNn1iY{Lha0A;5)bO=+SS1Lr*;=piH) z3~7<3TL|>gb)2QcsWzi*eB2z|r$N+Xyo2b1ojgAd&|4I1WA1tf`_IprMtn1AjCN>HjCs&7U#s znW}MIg4pW6^6hUqBhORyWb@`QXeP}3D=)*1sCQsiWM&*43()=~d? zq|Hr!*7Bjn%baK9LVqcufDH9h917Nbn2N0WiS8Dyq3caUdY)4L0%G&|1}SJ=_|*U| z`x1Pg4_uPO|LK;H7(u2QIPWT)KiKK@bXJNh!Gbc#pG3rr62&YG`K|`&A+a(KUWpG% z+!Z*0qiFloG)|qH^Irn1Rj+=rn1trUq+)jn4ZlFG@M4xT% z?>1Y|MiSgB5fQZJqL9edxIC44D}1b;HneGv^DNe^(GU9N{_BL=){U)FUEst}EeMY4Snflaxl zn-gn_IAoGmyF~ZBO_7Rf!3)jt0Tm=%vcjM-Ja*GM6i!uLB=XX{RThZS^UPVR#h$Xp zpAA>eeb`0u(HNm;4x7wmq3efk6SOG9Fc@<$Cz~+UJ=lD2Lz4_c(DMJfq1>^EfsM}f zc#<5Ymh}DfZNX#Fc8#k5wLd1^4Sjm4N18J(y@rPE5L9 zy~@Y4hb*w(?`(*MDD$8?N1~j4Yt%iRDPBDr`u?{m&&qv_GC@Y=3}>b3Kke4!pEA0P zL*`O7Xd{1qR(Llk4&Q(Ggptc5+(Oy5EMMd>ZrD0(85I*DasDwFlxDk%V!Nl7Uel?Vb7lT2RjxKDlRtmY5@rV*{@j8jkD$ literal 0 HcmV?d00001 From 17d945b038dc920995af9dc7d2ed3124a2f6bee8 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sun, 17 Jun 2018 23:42:25 +0100 Subject: [PATCH 02/25] Deploy on all branches for now --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index a67748e1..0c440c33 100644 --- a/.travis.yml +++ b/.travis.yml @@ -81,6 +81,8 @@ deploy: keyfile: peter-ola-rdm-app-51be81f8c2c3.json.enc project: peter-ola-rdm-app skip_cleanup: true + on: + all_branches: true notifications: irc: From e40e15b861c3bf19e81d2d8fc95eccf3505f662b Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sun, 17 Jun 2018 23:57:19 +0100 Subject: [PATCH 03/25] Add the missing file --- .gitignore | 2 ++ .travis.yml | 2 +- credentials.tar.gz.enc | Bin 0 -> 1840 bytes peter-ola-rdm-app-51be81f8c2c3.json.enc | Bin 2320 -> 0 bytes 4 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 credentials.tar.gz.enc delete mode 100644 peter-ola-rdm-app-51be81f8c2c3.json.enc diff --git a/.gitignore b/.gitignore index 50155cea..7da0fe2c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ *rdm*.json *.pyc *.swp +api_key.py +credentials.tar.gz node_modules index.yaml .idea diff --git a/.travis.yml b/.travis.yml index 0c440c33..076541c8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ cache: sudo: false before_install: - - openssl aes-256-cbc -K $encrypted_7eede60d6b12_key -iv $encrypted_7eede60d6b12_iv -in peter-ola-rdm-app-51be81f8c2c3.json.enc -out peter-ola-rdm-app-51be81f8c2c3.json -d + - openssl aes-256-cbc -K $encrypted_7eede60d6b12_key -iv $encrypted_7eede60d6b12_iv -in credentials.tar.gz.enc -out credentials.tar.gz -d - if [[ "$TASK" == "spellintian" ]]; then sudo add-apt-repository ppa:waja/trusty-backports -y; sudo apt-get update -qq; sudo apt-get install lintian -y; fi # Install a late enough lintian install: diff --git a/credentials.tar.gz.enc b/credentials.tar.gz.enc new file mode 100644 index 0000000000000000000000000000000000000000..8563a62221d38b1d2b28db7b3b93fa66c3802783 GIT binary patch literal 1840 zcmV-02haHR@MhiYX%t0`rGgTc`cY_Nvwr&oWtb%i{T?pf)(XSVvnu&%KU(JyUut9K zWojZ$G`fTEpH6lH5j=N|9X=){&|vP+F@tq-jFH+&z>s9|OEYlWl~&E!xT{h=Ti|tf zTr@JiU(oGOkZkw5vK`xo;lW{fRGq>iN#R4aG?{gW$u{9JLC*w^2=A$dof!MsHJd6H z7_L8n$doM*NOD)_s`r=4=HJiz_JPqh#wo;oy&@LRbw@H9qVeOVNJalnU6H4_~BaOIfS@&8|k1zJBMT6$LWx|6H}; zUn-jLK6ge`(HEUciN5&F@e94twXc@Fo}*R;wjJ>x*n7Q!nriA458qQepp*q3-@Kj~ zam^$qf^sY@R*rzG`5gJNYVVt$E2LK{_Ier<@t@lN#KXsMm)~RDR!+)!h;py+>!;#o;I=sptXSO zrg`|oExIpXXh;lo=~Y{VJwRwV%NooqB0brF8nf;;wQCA3gBUQ+Gb*6^%nFg?TKQL$ zFxiwQQcrBOO{+6QgT~p1ByZ)epLW9X8MDRWLSZO|o}*u`DZ8lSddM*UK6xo83l^HR z)~vbsmX`HG1P|BON8Q<;*#v|Ck_C+onh{(9uk{m2aJp5%Am|bT#{m8y+kGKOTH(kA z((}i?ZlI|eu{tRXd%v>Pe%K`b#F55Mf6Op1zDZ+_mUtr~UD(I;3rIk4P*MwqwjVM& zJ1|XT4*%|!3FK^l-KT7%ow2Tv^hS+zhwl~8xC#OEU%z-GNT{`XD7^1c>v7G0OK!)^hIx?h@G|~73`uUUmI#}8%{v9gYgO%{a{l%M3gT#x@g zUR(nMkJX%tWbA7XCQnSpaF2q_K(^5)&l(I$S@_J_D0XiZGMdy?61ums!g+pm-0pRz zWPo3rodum$8H%h~2XS=H1fv@X=mq*eRFd5AgW$C%a{*}mZ!cBv3TQ$>zZl>eL!bjjG3CXeM?lh=o23Cay!x70P|pT#YRCwzz9i1 z@ztr9xMRS5rr4?;3ruA~S_?52kA*jN& zU>IfL9f}|J`kBD4D(=#{ohj&BBaYhWg}5iHjapfOhc0mk+6{q;G+{vEk;AcD;spoV z*wL{o99+w2Il$+0RUp4uyI>)BFH0tywZld--vzQpIE7l+_rS$ntUH5OVFO$p6 zaKnR=5}9=;ErC(+XI>ffKTWnvBlLfV76e8^LjsP2*;Z6=LkU2P0dlflRU3zN1|uPA z>!$QC@ezhaEPZF*T$!2=-dg7Na>vX=@rtJJE7dg5^OdeX;4(MUXBwQK%>hwx+c;!i zP+4Jj_eBJdOd{rOP|CrL{&~U+f?P|#Ruu|$PXy>$e@045TK${&Y5@aqc@HPDb-$L( z`4|^wrkX;vFODbIk;Lbw&}U1i~y?;3Ow z{#J=aBH)r00!DM)#xzofk7OFH9n~ozHfq0Y6TajHvPh58a<}V7qu<*3Nl7+~`Fg{m zM$6Q`Z1GAS3ZI-POIm`}rRfo!H6yd@vNkcQxCe$EIWNy$s!#Ov(9Is4Wl`12Lo!7E zZ)n2+?TEe=;knH)hPo>R_DL9w^7HTE7b(aSK literal 0 HcmV?d00001 diff --git a/peter-ola-rdm-app-51be81f8c2c3.json.enc b/peter-ola-rdm-app-51be81f8c2c3.json.enc deleted file mode 100644 index 7e89b480524658be55acb1bee39cba8dd5544e4f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2320 zcmV+r3GenD^JDx9H+g!%Db0Mm7!f!X5$=jUWHb^@?ze$^Mz^I8H4=+?sr;E9>!$Uw zIfD!+;4ha(F6KatodxO%&PkD?&J2xqfJMN*qU@q&-XVB8(EV>oH*< z*5{%6Vuoq(H8F!3^6M3$%PsxR?=uk!cJ(tCHhh$xEwX#pJMg!pdu~HkpPO>ZtIk$B zxjF(7v6k0%vU{8n+=`~pd88Pqp(lbZJ_7j@|#ZPcd{OAx%BFh7EhQH=|cx z-DY?TpHKH)jOXtxTL4Mf<7u-hRbUamgsM)B_V)W8iP~ z?pfeosz=T6z(}9(3#md(#8H-CzS|w1m&|}Px{8wE#Ljvhn6=PDuD2($ywleA@~R;9 zH>xX^^_zIuOxwMrr0Jb^jMrFW?A=shk*qO8VY2jja&JA9dK{ef-lm;6EWSj{Dqj_M zXEc8Mu!xZujbFNrM}9@xDb|lCUL=2UT6fDP>;3N7)mSs{LU#b2VUSQ{fxomH>$G9v z&s7NqvNm?$n{qszX9FoH=f~R#@zHbYv79Qp- zkR5#AX_&HiIS~TysN>t;FN10;H~u0>ggEo2u2;I(!iE{p_n(c`U{|1eP;>HcK*#atD=v3D0q8K z=Jz&=vEp~A;(+{CI5AH{xc9*uA zY%cG(UtW;58lm2kXT^dM*xGpwg8$FA!Cjh+AM8_!fhH)w0ZS5i()>9ae6k6(FzB_EA_+5U7w`t7!c zp))2A4uzQ7_D661(a_D@SvO0WzA&R&#-&K0sCEO;vjvf>JZC&UkQq51OqTP zT1qoD@Sn6t^S}vWhPsBSFyI#&!ha-Ky7|nR{Tj++A%ev~DdC3;Y}u#axh=bgU8%!M z7VE78CgLF9zr%74*Z5OtXA>V`Ze=Id&VQU}17yvAe?Le+Kv+=Jc(y^LLB$^75xzbU zTJfdg3tOp93L9e`01VT(c`v1yqjsM*E6nMNNn1iY{Lha0A;5)bO=+SS1Lr*;=piH) z3~7<3TL|>gb)2QcsWzi*eB2z|r$N+Xyo2b1ojgAd&|4I1WA1tf`_IprMtn1AjCN>HjCs&7U#s znW}MIg4pW6^6hUqBhORyWb@`QXeP}3D=)*1sCQsiWM&*43()=~d? zq|Hr!*7Bjn%baK9LVqcufDH9h917Nbn2N0WiS8Dyq3caUdY)4L0%G&|1}SJ=_|*U| z`x1Pg4_uPO|LK;H7(u2QIPWT)KiKK@bXJNh!Gbc#pG3rr62&YG`K|`&A+a(KUWpG% z+!Z*0qiFloG)|qH^Irn1Rj+=rn1trUq+)jn4ZlFG@M4xT% z?>1Y|MiSgB5fQZJqL9edxIC44D}1b;HneGv^DNe^(GU9N{_BL=){U)FUEst}EeMY4Snflaxl zn-gn_IAoGmyF~ZBO_7Rf!3)jt0Tm=%vcjM-Ja*GM6i!uLB=XX{RThZS^UPVR#h$Xp zpAA>eeb`0u(HNm;4x7wmq3efk6SOG9Fc@<$Cz~+UJ=lD2Lz4_c(DMJfq1>^EfsM}f zc#<5Ymh}DfZNX#Fc8#k5wLd1^4Sjm4N18J(y@rPE5L9 zy~@Y4hb*w(?`(*MDD$8?N1~j4Yt%iRDPBDr`u?{m&&qv_GC@Y=3}>b3Kke4!pEA0P zL*`O7Xd{1qR(Llk4&Q(Ggptc5+(Oy5EMMd>ZrD0(85I*DasDwFlxDk%V!Nl7Uel?Vb7lT2RjxKDlRtmY5@rV*{@j8jkD$ From 538a2f9c1f567269f507d1e50642a042290bc102 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Mon, 18 Jun 2018 00:00:47 +0100 Subject: [PATCH 04/25] Get the right filename --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 076541c8..b57736bc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -78,7 +78,7 @@ script: "bash -ex .travis-ci.sh" deploy: provider: gae - keyfile: peter-ola-rdm-app-51be81f8c2c3.json.enc + keyfile: peter-ola-rdm-app-51be81f8c2c3.json project: peter-ola-rdm-app skip_cleanup: true on: From 926d8cb625ac837708338ef8520c8acc192146c9 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Mon, 18 Jun 2018 00:06:33 +0100 Subject: [PATCH 05/25] Extract our decrypted tar --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index b57736bc..1d32e211 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,7 @@ sudo: false before_install: - openssl aes-256-cbc -K $encrypted_7eede60d6b12_key -iv $encrypted_7eede60d6b12_iv -in credentials.tar.gz.enc -out credentials.tar.gz -d + - tar -xzf credentials.tar.gz - if [[ "$TASK" == "spellintian" ]]; then sudo add-apt-repository ppa:waja/trusty-backports -y; sudo apt-get update -qq; sudo apt-get install lintian -y; fi # Install a late enough lintian install: From 2000b699b132781440e3461b43addc8b11948be3 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Mon, 18 Jun 2018 00:10:22 +0100 Subject: [PATCH 06/25] Keep gcloud happy --- app.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.yaml b/app.yaml index 81179a72..7c17b116 100644 --- a/app.yaml +++ b/app.yaml @@ -1,4 +1,4 @@ -application: "olp-rdm-staging" +#application: "olp-rdm-staging" #application: "rdmprotocol-hrd" version: 1 runtime: python27 From c9e7ae74ef58bb9a3628a725c2893a469ceedd28 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Mon, 18 Jun 2018 00:13:42 +0100 Subject: [PATCH 07/25] More attempts to make gcloud happy --- app.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.yaml b/app.yaml index 7c17b116..bb7e457a 100644 --- a/app.yaml +++ b/app.yaml @@ -1,6 +1,6 @@ #application: "olp-rdm-staging" #application: "rdmprotocol-hrd" -version: 1 +#version: 1 runtime: python27 api_version: 1 threadsafe: no From 9978ff4f4442ad3c46c0efc876545e4efa7089e3 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 20 Jun 2018 20:07:46 +0100 Subject: [PATCH 08/25] Only run deploy ones, and prepare the JS before deploy --- .travis-ci.sh | 2 ++ .travis.yml | 20 ++++++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.travis-ci.sh b/.travis-ci.sh index 27f8c9ea..5e1f10f1 100644 --- a/.travis-ci.sh +++ b/.travis-ci.sh @@ -64,4 +64,6 @@ elif [[ $TASK = 'pychecker-wip' ]]; then PYTHONPATH=./:$PYTHONPATH export PYTHONPATH pychecker --quiet --limit 500 --blacklist $PYCHECKER_BLACKLIST $(find ./ -name "*.py" | xargs) +elif [[ $TASK = 'deploy' ]]; then + grunt --verbose compress fi diff --git a/.travis.yml b/.travis.yml index 1d32e211..e0260bf5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,6 +64,18 @@ matrix: - os: linux dist: trusty env: TASK='pychecker-wip' + - stage: deploy + os: linux + dist: trusty + env: TASK='deploy' + deploy: + provider: gae + keyfile: peter-ola-rdm-app-51be81f8c2c3.json + project: peter-ola-rdm-app + skip_cleanup: true + on: + all_branches: true + allow_failures: - os: linux dist: trusty @@ -77,14 +89,6 @@ matrix: script: "bash -ex .travis-ci.sh" -deploy: - provider: gae - keyfile: peter-ola-rdm-app-51be81f8c2c3.json - project: peter-ola-rdm-app - skip_cleanup: true - on: - all_branches: true - notifications: irc: channels: From 38b8880aaa4771d13c365c63d72cc25c7ac830a3 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 20 Jun 2018 20:43:46 +0100 Subject: [PATCH 09/25] Run grunt bower too --- .travis-ci.sh | 1 + README.md | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis-ci.sh b/.travis-ci.sh index 5e1f10f1..c2291494 100644 --- a/.travis-ci.sh +++ b/.travis-ci.sh @@ -65,5 +65,6 @@ elif [[ $TASK = 'pychecker-wip' ]]; then export PYTHONPATH pychecker --quiet --limit 500 --blacklist $PYCHECKER_BLACKLIST $(find ./ -name "*.py" | xargs) elif [[ $TASK = 'deploy' ]]; then + grunt --verbose bower grunt --verbose compress fi diff --git a/README.md b/README.md index 7ccbbf89..a4626899 100644 --- a/README.md +++ b/README.md @@ -137,7 +137,7 @@ respective file in the `data/` directory. ### Deploying to App Engine -Before deploying to App Engine run: +Before deploying to App Engine run (grunt bower if you hadn't already, and): ```bash grunt compress ``` From 98bd646c076a416ef29427b571d8aae578fa46c4 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Thu, 21 Jun 2018 01:40:18 +0100 Subject: [PATCH 10/25] Store the index.yaml in git for easier deployment --- .gitignore | 1 - index.yaml | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 index.yaml diff --git a/.gitignore b/.gitignore index 7da0fe2c..8008d552 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,6 @@ api_key.py credentials.tar.gz node_modules -index.yaml .idea static/libs static/js/rdm.js diff --git a/index.yaml b/index.yaml new file mode 100644 index 00000000..6d230da7 --- /dev/null +++ b/index.yaml @@ -0,0 +1,38 @@ +indexes: + +# AUTOGENERATED + +# This index.yaml is automatically updated whenever the dev_appserver +# detects that a new type of query is run. If you want to manage the +# index.yaml file manually, remove the above marker line (the line +# saying "# AUTOGENERATED"). If you want to manage some indexes +# manually, move them above the marker line. The index.yaml file is +# automatically uploaded to the admin console when you next deploy +# your application using appcfg.py. + +- kind: Pid + properties: + - name: draft + - name: manufacturer + - name: pid_id + +- kind: Pid + properties: + - name: manufacturer + - name: name + +- kind: Product + properties: + - name: class + - name: image_url + direction: desc + +- kind: Responder + properties: + - name: manufacturer + - name: device_model_id + +- kind: Responder + properties: + - name: manufacturer + - name: model_description From ecae5652a1c2938e32c66bbb1572ca3b808a41d3 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Thu, 21 Jun 2018 15:09:02 +0100 Subject: [PATCH 11/25] Attempt to get indexes uploaded during CD --- app.yaml | 2 -- index.yaml | 6 ++++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app.yaml b/app.yaml index bb7e457a..9a0f1ed5 100644 --- a/app.yaml +++ b/app.yaml @@ -90,8 +90,6 @@ builtins: skip_files: - ^(.*/)?app\.yaml - ^(.*/)?app\.yml -- ^(.*/)?index\.yaml -- ^(.*/)?index\.yml - ^(.*/)?#.*# - ^(.*/)?.*~ - ^(.*/)?.*\.py[co] diff --git a/index.yaml b/index.yaml index 6d230da7..05bde642 100644 --- a/index.yaml +++ b/index.yaml @@ -21,6 +21,12 @@ indexes: - name: manufacturer - name: name +- kind: Product + properties: + - name: class + - name: manufacturer + - name: name + - kind: Product properties: - name: class From f59b8762e8a7d218c380bc6bfa8b80dff191416b Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Thu, 21 Jun 2018 15:48:53 +0100 Subject: [PATCH 12/25] Skip uploading index.yaml again, as it didn't push indexes --- app.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app.yaml b/app.yaml index 9a0f1ed5..bb7e457a 100644 --- a/app.yaml +++ b/app.yaml @@ -90,6 +90,8 @@ builtins: skip_files: - ^(.*/)?app\.yaml - ^(.*/)?app\.yml +- ^(.*/)?index\.yaml +- ^(.*/)?index\.yml - ^(.*/)?#.*# - ^(.*/)?.*~ - ^(.*/)?.*\.py[co] From 872d48bc1e3e0b9e6f057beaf62dbabb27676368 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Mon, 25 Jun 2018 02:58:43 +0100 Subject: [PATCH 13/25] Also push index.yaml to GAE --- .travis.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index e0260bf5..d710273d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -69,9 +69,13 @@ matrix: dist: trusty env: TASK='deploy' deploy: - provider: gae - keyfile: peter-ola-rdm-app-51be81f8c2c3.json - project: peter-ola-rdm-app + - provider: gae + keyfile: peter-ola-rdm-app-51be81f8c2c3.json + project: peter-ola-rdm-app + - provider: gae + keyfile: peter-ola-rdm-app-51be81f8c2c3.json + project: peter-ola-rdm-app + config: index.yaml skip_cleanup: true on: all_branches: true From def1d8fda67f0031b93f40c73f5b5058f8844712 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Mon, 25 Jun 2018 03:06:35 +0100 Subject: [PATCH 14/25] Duplicate some config to try and make a valid .travis.yml --- .travis.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index d710273d..d7f2f606 100644 --- a/.travis.yml +++ b/.travis.yml @@ -72,13 +72,16 @@ matrix: - provider: gae keyfile: peter-ola-rdm-app-51be81f8c2c3.json project: peter-ola-rdm-app + skip_cleanup: true + on: + all_branches: true - provider: gae keyfile: peter-ola-rdm-app-51be81f8c2c3.json project: peter-ola-rdm-app config: index.yaml - skip_cleanup: true - on: - all_branches: true + skip_cleanup: true + on: + all_branches: true allow_failures: - os: linux From 31077dd0cc6d7e70e0dd7a662f9ce9544752d3d2 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Mon, 25 Jun 2018 10:07:15 +0100 Subject: [PATCH 15/25] Add more indexes --- index.yaml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/index.yaml b/index.yaml index 05bde642..4e5738e3 100644 --- a/index.yaml +++ b/index.yaml @@ -24,14 +24,19 @@ indexes: - kind: Product properties: - name: class - - name: manufacturer - - name: name + - name: image_url + direction: desc - kind: Product properties: - name: class - - name: image_url - direction: desc + - name: manufacturer + - name: name + +- kind: ProductTag + properties: + - name: product_type + - name: label - kind: Responder properties: From 4fcf61ed5ab0977941e0f2ff9c97b93197eb279f Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Tue, 26 Jun 2018 16:47:38 +0100 Subject: [PATCH 16/25] Make the sending email address generic --- common.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common.py b/common.py index abdd4fbe..ed48ede6 100644 --- a/common.py +++ b/common.py @@ -22,6 +22,7 @@ import logging import memcache_keys import textwrap +from google.appengine.api import app_identity from google.appengine.api import mail from google.appengine.api import memcache from google.appengine.ext import webapp @@ -110,7 +111,7 @@ def MaybeSendEmail(new_responder_count): query.filter('processed = ', False) if query.count() == new_responder_count: message = mail.EmailMessage( - sender='RDM Site ', + sender=('RDM Site ' % app_identity.get_application_id()), subject='Pending Moderation Requests', to='', ) From 6901f7df17017c16144735ce091e1168fe699d3a Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Mon, 16 Jul 2018 12:05:23 +0100 Subject: [PATCH 17/25] More codespellignore (cherry picked from commit 47f7111c49b1bbfeb9360657c22734a39f296dab) --- .codespellignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.codespellignore b/.codespellignore index aa4f0d2b..2f336610 100644 --- a/.codespellignore +++ b/.codespellignore @@ -1,6 +1,7 @@ (0x01B2, "DJSI Schinstad ANS (Northern Light)"), (0x01CF, "SRM Technik GmbH"), (0x030F, "Guangzhou Litewise Lighting Equipments Co., Ltd. dba \"EK Lights\""), +(0x0931, "Cristal Controles"), (0x1BC0, "ALS Stanislaw Binkiewicz"), (0x20B9, "ARRI -- Arnold & Richter Cine Technik GmbH & Co. Betriebs KG"), (0x4D54, "medien technik cords"), From 8148e62f07b4b838c747b4241fa3363c3f46da0a Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Mon, 16 Jul 2018 15:27:10 +0100 Subject: [PATCH 18/25] Ensure grunt/npm stuff is available for deploy task --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c42b4982..5a5efe5b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,8 +17,8 @@ before_install: install: - if [ "$TASK" = "nosetests" -o "$TASK" = "flake8" -o "$TASK" = "flake8-wip" ]; then pip install json-spec; fi - - if [ "$TASK" = "karma" -o "$TASK" = "js-lint" -o "$TASK" = "closure-compiler" ]; then npm install -g grunt-cli; fi - - if [ "$TASK" = "karma" -o "$TASK" = "js-lint" -o "$TASK" = "closure-compiler" ]; then npm install; fi + - if [ "$TASK" = "karma" -o "$TASK" = "js-lint" -o "$TASK" = "closure-compiler" -o "$TASK" = "deploy" ]; then npm install -g grunt-cli; fi + - if [ "$TASK" = "karma" -o "$TASK" = "js-lint" -o "$TASK" = "closure-compiler" -o "$TASK" = "deploy" ]; then npm install; fi - if [ "$TASK" = "flake8" -o "$TASK" = "flake8-wip" ]; then pip install flake8; fi # If this causes SSL errors, then Sourceforge is probably in disaster recovery mode and needing Javascript. Could switch to a specific mirror, e.g. kent.dl.sourceforge.net - if [ "$TASK" = "pychecker" -o "$TASK" = "pychecker-wip" ]; then pip install http://sourceforge.net/projects/pychecker/files/pychecker/0.8.19/pychecker-0.8.19.tar.gz/download; fi From b7d8c697cd5a154d8c4a6be38e45d71b02dedbd3 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sat, 28 Jul 2018 17:30:18 +0100 Subject: [PATCH 19/25] Send more appropriate emails from dev systems --- common.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/common.py b/common.py index ed48ede6..41a8857a 100644 --- a/common.py +++ b/common.py @@ -110,15 +110,20 @@ def MaybeSendEmail(new_responder_count): query = UploadedResponderInfo.all() query.filter('processed = ', False) if query.count() == new_responder_count: + is_live_site = (app_identity.get_application_id() == "rdmprotocol-hrd") message = mail.EmailMessage( - sender=('RDM Site ' % app_identity.get_application_id()), + sender=('%sRDM Site ' % + (("" if is_live_site else ( + app_identity.get_application_id() + " ")), + app_identity.get_application_id())), subject='Pending Moderation Requests', to='', ) message.body = textwrap.dedent("""\ There are new responders in the moderation queue. - Please visit http://rdm.openlighting.org/admin/moderate_responder_data - """) + Please visit http://%s/admin/moderate_responder_data + """ % ("rdm.openlighting.org" if is_live_site else ( + app_identity.get_application_id() + ".appspot.com"))) message.send() From ea0c59a5e374d8fbb9acb1911ef99e4fce8b63c5 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Mon, 6 Aug 2018 01:09:28 +0100 Subject: [PATCH 20/25] Only decrypt credentials on deploy task --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5a5efe5b..2ec7ef7f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,8 +11,7 @@ cache: sudo: false before_install: - - openssl aes-256-cbc -K $encrypted_7eede60d6b12_key -iv $encrypted_7eede60d6b12_iv -in credentials.tar.gz.enc -out credentials.tar.gz -d - - tar -xzf credentials.tar.gz + - if [[ "$TASK" == "deploy" ]]; then openssl aes-256-cbc -K $encrypted_7eede60d6b12_key -iv $encrypted_7eede60d6b12_iv -in credentials.tar.gz.enc -out credentials.tar.gz -d && tar -xzf credentials.tar.gz; fi - if [[ "$TASK" == "spellintian" ]]; then sudo add-apt-repository ppa:waja/trusty-backports -y; sudo apt-get update -qq; sudo apt-get install lintian -y; fi # Install a late enough lintian install: From c0c2215e1149b8d9dfeda489fe2796154938c618 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Mon, 6 Aug 2018 01:26:03 +0100 Subject: [PATCH 21/25] Add another codespellignore --- .codespellignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.codespellignore b/.codespellignore index 7d90bca9..a8309fc7 100644 --- a/.codespellignore +++ b/.codespellignore @@ -8,3 +8,4 @@ (0x5655, "Shenzhen CAS VU Technologies Co., Ltd."), (function($){var escapeable=/["\\\x00-\x1f\x7f-\x9f]/g,meta={'\b':'\\b','\t':'\\t','\n':'\\n','\f':'\\f','\r':'\\r','"':'\\"','\\':'\\\\'};$.toJSON=typeof JSON==='object'&&JSON.stringify?JSON.stringify:function(o){if(o===null){return'null';} return'{'+pairs.join(',')+'}';}};$.evalJSON=typeof JSON==='object'&&JSON.parse?JSON.parse:function(src){return eval('('+src+')');};$.secureEvalJSON=typeof JSON==='object'&&JSON.parse?JSON.parse:function(src){var filtered=src.replace(/\\["\\\/bfnrtu]/g,'@').replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,']').replace(/(?:^|:|,)(?:\s*\[)+/g,'');if(/^[\],:{}\s]*$/.test(filtered)){return eval('('+src+')');}else{throw new SyntaxError('Error parsing JSON, source is not valid.');}};$.quoteString=function(string){if(string.match(escapeable)){return'"'+string.replace(escapeable,function(a){var c=meta[a];if(typeof c==='string'){return c;} + - provider: gae From 1ef8051f84f34a4f7e132a4122375a874cfd9cb6 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sat, 24 Aug 2019 15:00:35 +0100 Subject: [PATCH 22/25] Deploy app and index YAML files at the same time. Thanks to changes in https://github.com/travis-ci/dpl/pull/1067 --- .travis.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6b5557a8..3f04d68b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -68,13 +68,9 @@ matrix: - provider: gae keyfile: peter-ola-rdm-app-51be81f8c2c3.json project: peter-ola-rdm-app - skip_cleanup: true - on: - all_branches: true - - provider: gae - keyfile: peter-ola-rdm-app-51be81f8c2c3.json - project: peter-ola-rdm-app - config: index.yaml + config: + - app.yaml + - index.yaml skip_cleanup: true on: all_branches: true From 227d2e19b5670b17762cf4fff18ed7c57d6be6f1 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sat, 24 Aug 2019 18:08:35 +0100 Subject: [PATCH 23/25] Switch to dpl v2 for multiple configs at once As per advice in https://github.com/travis-ci/dpl/issues/829#issuecomment-524558312 --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 1e966420..d90b3084 100644 --- a/.travis.yml +++ b/.travis.yml @@ -74,6 +74,8 @@ matrix: env: TASK='deploy' deploy: - provider: gae + edge: + branch: master keyfile: peter-ola-rdm-app-51be81f8c2c3.json project: peter-ola-rdm-app config: From fef4ece6299df5cde26bd88954dfa0324ee3480a Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Fri, 30 Aug 2019 12:07:18 +0100 Subject: [PATCH 24/25] Switch to the standard edge version of dpl v2 and update a few bits to match https://blog.travis-ci.com/2019-08-27-deployment-tooling-dpl-v2-preview-release --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index d90b3084..fcdfeee0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -74,14 +74,12 @@ matrix: env: TASK='deploy' deploy: - provider: gae - edge: - branch: master + edge: true keyfile: peter-ola-rdm-app-51be81f8c2c3.json project: peter-ola-rdm-app config: - app.yaml - index.yaml - skip_cleanup: true on: all_branches: true From 0d8e6b4c65bfe122802715a120eebf84949ab6f9 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Fri, 21 Feb 2020 11:13:16 +0000 Subject: [PATCH 25/25] Fix a broken merge --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7ac46ecb..0255d885 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,8 +14,8 @@ before_install: install: - if [ "$TASK" = "nosetests" -o "$TASK" = "flake8" -o "$TASK" = "flake8-wip" ]; then pip install json-spec; fi - - if [ "$TASK" = "karma" -o "$TASK" = "js-lint" -o "$TASK" = "closure-compiler" -o "$TASK" = "deploy" ]; then npm install -g grunt-cli; fi - - if [ "$TASK" = "karma" -o "$TASK" = "js-lint" -o "$TASK" = "closure-compiler" -o "$TASK" = "deploy" ]; then npm install; fi + - if [ "$TASK" = "karma" -o "$TASK" = "lint" -o "$TASK" = "closure-compiler" -o "$TASK" = "deploy" ]; then npm install -g grunt-cli; fi + - if [ "$TASK" = "karma" -o "$TASK" = "lint" -o "$TASK" = "closure-compiler" -o "$TASK" = "deploy" ]; then npm install; fi - if [ "$TASK" = "flake8" -o "$TASK" = "flake8-wip" ]; then pip install flake8; fi # If this causes SSL errors, then Sourceforge is probably in disaster recovery mode and needing Javascript. Could switch to a specific mirror, e.g. kent.dl.sourceforge.net - if [ "$TASK" = "pychecker" -o "$TASK" = "pychecker-wip" ]; then pip install http://sourceforge.net/projects/pychecker/files/pychecker/0.8.19/pychecker-0.8.19.tar.gz/download; fi