Commit0b9931f

committed

chore: merge branch 'config' into dev

2 parentsd81a770 +c83b0f2 commit0b9931fCopy full SHA for 0b9931f

File tree

+11

-0

lines changed

+11

-0

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,9 @@ addons:`
`11`	`11`	`-libgconf-2-4`
`12`	`12`
`13`	`13`	`before_install:`
	`14`	`+ -mkdir -p ~/bin && curl -sSL -o ~/bin/jq https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 && chmod +x ~/bin/jq`
	`15`	`+ -export PATH=$PATH:~/bin`
	`16`	`+ -jq --version`
`14`	`17`	`-sudo chown -R travis ./travis/install_node.sh`
`15`	`18`	`-sudo chmod +x ./travis/install_node.sh`
`16`	`19`	`-./travis/install_node.sh`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,10 @@ ADD web.tar.gz /root/web`
`6`	`6`	`RUN npm install -g pm2 --registry=https://registry.npm.taobao.org`
`7`	`7`	`RUN cd /root/web/ && npm install --registry=https://registry.npm.taobao.org`
`8`	`8`
	`9`	`+RUN mkdir -p ~/bin && curl -sSL -o ~/bin/jq https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 && chmod +x ~/bin/jq`
	`10`	`+RUN export PATH=$PATH:~/bin`
	`11`	`+RUN jq --version`
	`12`	`+`
`9`	`13`	`RUN cd /root/web/ && make build.dev`
`10`	`14`
`11`	`15`	`ADD loader.sh /usr/local/bin/loader.sh`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,10 @@ RUN npm install -g pm2 --registry=https://registry.npm.taobao.org`
`7`	`7`	`RUN cd /root/web/ && npm install --registry=https://registry.npm.taobao.org`
`8`	`8`	`RUN cd /root/web/ && npm i terser@3.14`
`9`	`9`
	`10`	`+RUN mkdir -p ~/bin && curl -sSL -o ~/bin/jq https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 && chmod +x ~/bin/jq`
	`11`	`+RUN export PATH=$PATH:~/bin`
	`12`	`+RUN jq --version`
	`13`	`+`
`10`	`14`	`RUN cd /root/web/ && make build.prod`
`11`	`15`
`12`	`16`	`ADD loader.sh /usr/local/bin/loader.sh`

Comments

(0)