Mirrors/super-productivity
1
0
Fork 0
mirror of https://github.com/johannesjo/super-productivity.git synced 2026-01-23 02:36:05 +00:00
Code Issues Projects Releases Wiki Activity

chore: fix build

Browse source
This commit is contained in:
Johannes Millan 2020-02-16 00:33:07 +01:00
parent fd05434682
commit efd27e52d0
3 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -53,7 +53,7 @@ script:
fi
if [ "$TRAVIS_OS_NAME" == "linux" ]; then
echo '____RUNNING DOCKER____'
bash ${TRAVIS_BUILD_DIR}/build/docker/run-linux-win.sh
bash ${TRAVIS_BUILD_DIR}/build/docker/run-linux-win.sh ${PUB}
else
yarn install && yarn add 7zip-bin-mac
yarn run buildAllElectron

6
build/docker/run-linux-win.sh
View file

@ -1,9 +1,13 @@
#!/usr/bin/env bash
PWD2=$PWD
# read as arg
PUB=$1
cd "$(dirname "$0")"
echo PUB $PUB
docker run $ENVS --rm \
$(env | \
grep -Eo '^[^\s=]*(_TOKEN|_KEY)[^\s=]*' | \
@ -14,4 +18,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____' && node -v && npm -v && yarn -v && ls -l && 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"

2
package.json
View file

@ -40,7 +40,7 @@
"localInstall:mac": "sudo echo 'Starting local install. Don`t forget APPLEID & APPLEIDPASS !!' && yarn buildAllElectron && sudo echo '' && electron-builder && sudo cp -rf app-builds/mac/superProductivity.app/ /Applications/superProductivity.app",
"dist": "yarn buildAllElectron && electron-builder",
"dist:only": "electron-builder",
"dist:linuxAndWin": "yarn buildAllElectron && electron-builder build --linux --win",
"dist:linuxAndWin": "yarn buildAllElectron && electron-builder --linux --win",
"dist:win": "yarn buildAllElectron && electron-builder --win",
"dist:win:only": "electron-builder --win",
"dist:win:appx": "yarn buildAllElectron && electron-builder --win --config=build/electron-builder.appx.yaml",