From 2a0675e72605f1d039def35228d353dfba878ee8 Mon Sep 17 00:00:00 2001 From: Rodrigo Orem Date: Sun, 23 Aug 2020 20:40:46 -0300 Subject: [PATCH] Fix Travis CI (#291) Replace encryption key and improves Travis scripts --- .travis.yml | 3 ++- Makefile | 8 +++----- burlesco-pkcs8-key.pem.enc | Bin 1712 -> 1712 bytes package-lock.json | 40 ++++++++++++++++++++++++++----------- package.json | 2 +- 5 files changed, 34 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index bcb0ff4..26cf336 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,8 @@ before_deploy: - > if ! [ "$BEFORE_DEPLOY_RUN" ]; then export BEFORE_DEPLOY_RUN=1; - openssl aes-256-cbc -K $encrypted_351cc0f0ed5f_key -iv $encrypted_351cc0f0ed5f_iv -in burlesco-pkcs8-key.pem.enc -out burlesco-pkcs8-key.pem -d; + openssl aes-256-cbc -K $encrypted_094982294358_key -iv $encrypted_094982294358_iv + -in burlesco-pkcs8-key.pem.enc -out burlesco-pkcs8-key.pem -d make build; bash scripts/gen-gh-pages.sh; fi diff --git a/Makefile b/Makefile index 20d5d96..72d8a99 100644 --- a/Makefile +++ b/Makefile @@ -7,8 +7,9 @@ all: clean lint pre-build clean: rm -rf "$(DIST_DIR)" lint: - find . -name '*.json' -exec python -c 'import json; json.load(open("{}"))' \; - npx eslint src + set -e ; \ + find . -path ./node_modules -prune -false -o -name '*.json' -exec python -c 'import json; json.load(open("{}"))' \; ;\ + npx eslint src; pre-build: clean set -e ; \ for i in $(BROWSERS) ; do \ @@ -30,9 +31,6 @@ build: pre-build DIR="$(DIST_DIR)/$$i" ; \ FILE=burlesco-$$i.zip ; \ if [ $$i = "chromium" ]; then \ - if [ ! -f "$(CRX3_KEY)" ]; then \ - openssl genpkey -out "$(CRX3_KEY)" -algorithm RSA -pkeyopt rsa_keygen_bits:2048 2>/dev/null ; \ - fi ; \ zip -jr9X "$$DIR/$$FILE" $$DIR/src/* ; \ cat "$$DIR/$$FILE" | crx3 --crxPath="$$DIR/burlesco-chromium.crx" \ --keyPath="$(CRX3_KEY)" ; \ diff --git a/burlesco-pkcs8-key.pem.enc b/burlesco-pkcs8-key.pem.enc index b1783952dc6f3aeb9ae6d3d405093143ad81eb78..76aa1c06edcffdbd50cdd23db09407c3b5b5001e 100644 GIT binary patch literal 1712 zcmV;h22c4>=D6QPT%3e`Z%>1)hisL+f6jfi*~dnlYqmOTx1X~9CpJbk(^jYVJhF3X>b6fxOaw{6z_#Q6q#M#@&%X z=OwHJQ{dlzHSxUOCdeJx6bjb(&1oqya~XrX|6l6%;~q}5aI(+n6#bDuJudDJIyj~W zX{AklplYeei0Do>DW-V)@O1JMKhJ@Ks(fF6s@sC0wi@Hbytl)DlH#a88jlGW`wHG0 zU4+JF$xel%ao!iIZHD$$$F0a&O1Sg|$IGhNGfNb%<)X=@RmK0ZPjm1bS%`CB9)P5q zfR|!@VGJ5{FYOE}){OVFUuxE(fa3QMlEIssGSD672FW!$)pX02`VmN28KAT<8w8_? zBBO=XA?PN2Qv|9RfrpZ_Y+_|*qdCCP|KO8O_8{gzl_?KeP;+0t)Op`|yr=zT%V2HH3aSR<#)39jYNRTI2VSViwqhatFw<%Anv{#12AK}Zab&am2< zED2dWE!k#J8-PVVwPczlH>^_Hu8e_DDF$FBjdVmUw61&&&0JggR8o60h)28Hpt6*Q&SOEPo}GS=h7%3@6z`>pTAj}F@U||p?U*uw&vLTn*)nkH z6&#v7I2y^2VG$5E6m%4f3h$o13}x$dl4#$|IDR&5K+0Yg#0@H|28taz-L$}zlwUz) zpEDETANwTdSyDF!0$K18KVnPa9fr{B184m03J=ssfjePn{^5C6;+4U;pjomN4EX zrj%@2;B^LjB3tKkMcMXED;1&tSR@>{XSs>9VIJ4?zw3w}?lfYfs|@C&xPQJ5jr%1) zJ#vXZ0_~XVW|^JNy!&xYDbK zh9O}}`SqeiR$I_EDHGE5)$YG^TPxmhQMr{(7L_sC0E+lAov3MY7FGi`OI7&Ow#$;E zb2YptiY``jmxVco2%gP1*1R)6-h<@{d>UZn(C)T(hyOYaysDoJzKY+w72#mZ(9ABQ z%P!7h2XhIL%7odTOXFQMM%P^Q#w_X<%@&&k-5oV<3lXxct7Dj!2uNZ~wBH{Z3-KoJ z0@N&}%TDp+uqcl%eHX-%ev}Y$^&dd!j;C72(4m)Wp6?hQhY6O|9c*zzc2GpP2;rsV z;holic0F{7{pwik1<2~swz^mSnFEeHFO~I{KaO(?i5l60hHVo+jGG1EeUBZ(2Lq;E zBV0Ph_IcfLJI4Mt+YED`yOY)!r)1}zIY)lO4Rv^Xo#nG)F8*n?iz5m+pLM`^>>htz zPwaNaA}Ng5YrEiGArWNwN10ik12i~=h~P-*_y3zf=bG8|A9-K*^D6gbd8b?Zd88V% zFPO;%z59ckgJ13L%QO9#g|b&_h7VZZQ(@D&*o%~YzCqhLv{)y}jffj(Zx;+XOyQ&) GZ2K1r%v>=5 literal 1712 zcmV;h22c6-2Y7eo+-O_A6-@r5Zw061WGR&wj5vCHorl1~Dk0*;-{TB1XZ5xq7}&r= zr5V&*l_CC2;_7lR+lhhzNcZhu8%$_=IUOhZb^$w4B{c)tqe-j2%SDmKR!8t+sOgaO z)^!{>RAc#msSplENN{DaqL*gC6WCmMuR|q&;#}oMBFMBPhu0U}Dp)Uq z$zELY*M|4vWkSuO$kkG0NYx5v3lRtd0Dk%??NV16t8`I=5D2kdHw6R+9;5=pGIH9V z=*D6~oaS!s-AUH(P4#(kcE#`G+Uwzmwf{4)wRYR%+L7qlq%&(U^rvaua6ge zcNo3bQshEY)k!oaW`rpzoV3&-#2;#x~@T+9RE_DL? zRl(NPp07}Wh+TUV2#tfg% z>h*O%)5hFNTs*YRm|)|y{Wh~%b!;K+Z3Ky}{p=SNSCq2ubH*fvgy4V38BhL>O?Sur z(H5?A0TETv+L>>f=MGLLPsh(l#Uv4T;pC`N7ZwPEG5@=gUUue+a?x=CW9fJuK1uE< zhI-j~ioi|R8O%1;z$!5O(_KlAB;qF)7Jab@+t~SwdYz98BCn+k6g@nWboRCj-OW4L zTXq+ONi~?hC)#v%Ht95kEJ#~U?E8Fn{ELl{{@k8~@-3>3YY64}xA!jyhDL+V+ZWdS zadV&NMo_UcF_&GV%L9p0r>uciUg8<5OB^UYLHOBzF}4By3M36GaVrEfhogc!8^z&u zx5!H&)v}dI7ul0Pj%%ga!E-l9+h&6Az!Stv7OfR98p7G?$Uomt0|6aW)OM5WBi>y8 z*PXKA#^@<1KF&7C*{PK&@o~V6P92m+6#P8Jr7c_GrZ%|5f#eJ5r60+?fS^&Ygig>7O5BEe_RrSil;B5Q=?u|{7vlib!k#^op%pf-Nr2 zS9%G5l5*b6dJRLYj10i;U40dtm3o~D13;|W9n8)Ct}u7}CSoFjY%oph4SlN5*go08 zHyxYYqv&t(*2&yMWiZ$>_+)%EV(vo-Ezob0^X!3jsS7cReGb9fIHL`TruC~s68?wX zh?u+HpjNY?Qjh>q=V54_p?j;vJ7AN*QwnL2e&EJyp36_lgBCp$W0Gc~u0o?>NvyN_ zhxY@IRSp4cAh>sH83Yft5&2cWCiIFIrq;9dZ^8raJ$U=?a>6+pei!JmpkzD-8Dyhq znOUZhGb8#FJK(GH9nl#d!nRr4JehzZpnNf=NV$J8%fsMtUg>$Y?|o00RUIml@t}TC z<*mR8hJ56ARM(*J)1p4Bm=6}(;4yb#>?!k!kwsSU?%anG_j1C9xTtu%RWk0Tmh83P%&QZKj95O^gbHpS8X(kETRB zlNj!WK#(8Dg?x7jDi*H6EcsG<=G!LflyN-C+D{8W)HP5N{8%M6GlJ0PZh@-N6y5#F zmlZ0^0CDW@T;jMxk-J`jb>Whun8RGEL8+Z5CNXu*XDH^0`xPdfm3k=IVKFV_mOX`Fs`M zfNglYkH5QoioB5#PrJNKLwvbBqZYWTH7+h;ixC_XBadX1PafaLxD9x)obNy3#Z~5F G9tb@VIbo&% diff --git a/package-lock.json b/package-lock.json index 05f2ced..a4655f8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -638,6 +638,15 @@ "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz", "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==" }, + "bindings": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", + "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", + "optional": true, + "requires": { + "file-uri-to-path": "1.0.0" + } + }, "bl": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz", @@ -946,6 +955,7 @@ "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", "optional": true, "requires": { + "bindings": "^1.5.0", "nan": "^2.12.1" } } @@ -1273,9 +1283,9 @@ } }, "crx3": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/crx3/-/crx3-1.0.1.tgz", - "integrity": "sha512-gCPa3rJ4/bFuxVjdTtsMvnxzptx56pVk6jIWLsEWmjGuU4DIg1/mYztsqbF9k2ilaTo9zq1SAQU0Xb00EwoXPA==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/crx3/-/crx3-1.1.2.tgz", + "integrity": "sha512-EYp/rDiA7RbvsUJDAYaiUMEh2unG4bS6jX+4Qtv+JjuMf5CqFmGK0StdlKpSy06kgg7iosb8EtijznCsg5rnjw==", "requires": { "mri": "^1.1.4", "pbf": "^3.2.0", @@ -2025,6 +2035,12 @@ "flat-cache": "^2.0.1" } }, + "file-uri-to-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", + "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", + "optional": true + }, "fill-range": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", @@ -3334,9 +3350,9 @@ "optional": true }, "mri": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/mri/-/mri-1.1.4.tgz", - "integrity": "sha512-6y7IjGPm8AzlvoUrwAaw1tLnUBudaS3752vcd8JtrpGGQn+rXIe63LFVHm/YMwtqAuh+LJPCFdlLYPWM1nYn6w==" + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/mri/-/mri-1.1.6.tgz", + "integrity": "sha512-oi1b3MfbyGa7FJMP9GmLTttni5JoICpYBRlq+x5V16fZbLsnL9N3wFqqIm/nIG43FjUFkFh9Epzp/kzUGUnJxQ==" }, "ms": { "version": "2.1.1", @@ -3788,9 +3804,9 @@ "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==" }, "pbf": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/pbf/-/pbf-3.2.0.tgz", - "integrity": "sha512-98Eh7rsJNJF/Im6XYMLaOW3cLnNyedlOd6hu3iWMD5I7FZGgpw8yN3vQBrmLbLodu7G784Irb9Qsv2yFrxSAGw==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/pbf/-/pbf-3.2.1.tgz", + "integrity": "sha512-ClrV7pNOn7rtmoQVF4TS1vyU0WhYRnP92fzbfF75jAIwpnzdJXf8iTd4CMEqO4yUenH6NDqLiwjqlh6QgZzgLQ==", "requires": { "ieee754": "^1.1.12", "resolve-protobuf-schema": "^2.1.0" @@ -3882,9 +3898,9 @@ "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==" }, "protocol-buffers-schema": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.3.2.tgz", - "integrity": "sha512-Xdayp8sB/mU+sUV4G7ws8xtYMGdQnxbeIfLjyO9TZZRJdztBGhlmbI5x1qcY4TG5hBkIKGnc28i7nXxaugu88w==" + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.4.0.tgz", + "integrity": "sha512-G/2kcamPF2S49W5yaMGdIpkG6+5wZF0fzBteLKgEHjbNzqjZQ85aAs1iJGto31EJaSTkNvHs5IXuHSaTLWBAiA==" }, "psl": { "version": "1.8.0", diff --git a/package.json b/package.json index 47c82b6..c466e48 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "main": "", "dependencies": { "crx": "^4.0.1", - "crx3": "^1.0.1", + "crx3": "^1.1.2", "crypto": "^1.0.1", "eslint": "^5.16.0", "web-ext": "^4.3.0"