From c068d1622d0e38a9d069bef282b1e4f8cd9f17ad Mon Sep 17 00:00:00 2001 From: Johannes Millan Date: Mon, 6 Jul 2020 14:43:36 +0200 Subject: [PATCH] chore: exec post install for travis again --- .travis.yml | 2 +- build/docker/run-linux-win.sh | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 39d334813..d6a011cf4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,7 +55,7 @@ script: echo '____RUNNING DOCKER____' bash ${TRAVIS_BUILD_DIR}/build/docker/run-linux-win.sh ${PUB} else - NOYARNPOSTINSTALL=1 yarn install && yarn add 7zip-bin-mac + yarn install && yarn add 7zip-bin-mac yarn run buildAllElectron travis_wait 30 yarn dist:mac:dl -p $PUB fi diff --git a/build/docker/run-linux-win.sh b/build/docker/run-linux-win.sh index 552c103b4..30177e302 100644 --- a/build/docker/run-linux-win.sh +++ b/build/docker/run-linux-win.sh @@ -19,4 +19,4 @@ docker run $ENVS --rm \ -v ~/.cache/electron:/root/.cache/electron \ -v ~/.cache/electron-builder:/root/.cache/electron-builder \ $(docker image build -q .) \ - /bin/bash -c "echo '____DOCKER_INNER_START____' && echo $PUB && node -v && npm -v && yarn -v && ls -l && NOYARNPOSTINSTALL=1 yarn --link-duplicates --pure-lockfile && yarn run dist:linuxAndWin -p ${PUB} && ls -l ./dist" + /bin/bash -c "echo '____DOCKER_INNER_START____' && echo $PUB && node -v && npm -v && yarn -v && ls -l && yarn --link-duplicates --pure-lockfile && yarn run dist:linuxAndWin -p ${PUB} && ls -l ./dist" diff --git a/package.json b/package.json index 9e85783f5..22d6712d3 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "int:watch": "node ./tools/extract-i18n-watch.js", "int:find": "ngx-translate-extract --input ./src --output ./src/assets/i18n/*.json --sort --format namespaced-json --marker _", "int:clean": "ngx-translate-extract --input ./src --output ./src/assets/i18n/*.json --clean --sort --format namespaced-json --marker _", - "postinstall": " test -n \"$NOYARNPOSTINSTALL\" || ngcc" + "postinstall": " ngcc" }, "browserslist": [ "last 1 version",