Skip to content

Commit 5db7420

Browse files
committed
test win x32 build
1 parent a357589 commit 5db7420

File tree

2 files changed

+25
-16
lines changed

2 files changed

+25
-16
lines changed

.travis.yml

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,17 @@ script:
3838
- |
3939
rm -rf yarn.lock
4040
if [ "$TRAVIS_OS_NAME" == "linux" ]; then
41-
docker run --rm \
42-
--env-file <(env | grep -vE '\r|\n' | grep -iE 'DEBUG|NODE_|ELECTRON_|YARN_|NPM_|CI|CIRCLE|TRAVIS_TAG|TRAVIS|TRAVIS_REPO_|TRAVIS_BUILD_|TRAVIS_BRANCH|TRAVIS_PULL_REQUEST_|APPVEYOR_|CSC_|GH_|GITHUB_|BT_|AWS_|STRIP|BUILD_') \
43-
--env ELECTRON_CACHE="/root/.cache/electron" \
44-
--env ELECTRON_BUILDER_CACHE="/root/.cache/electron-builder" \
45-
-v ${PWD}:/project \
46-
-v ~/.cache/electron:/root/.cache/electron \
47-
-v ~/.cache/electron-builder:/root/.cache/electron-builder \
48-
electronuserland/builder:wine \
49-
/bin/bash -c "npm install && npm run electron:build -- --bundler builder --target linux"
50-
linux_file=`ls dist/electron/Packaged/ | grep '.AppImage$'`
51-
./ossutil64 cp "dist/electron/Packaged/${linux_file}" "${BUCKET}/${linux_file}" -f
41+
# docker run --rm \
42+
# --env-file <(env | grep -vE '\r|\n' | grep -iE 'DEBUG|NODE_|ELECTRON_|YARN_|NPM_|CI|CIRCLE|TRAVIS_TAG|TRAVIS|TRAVIS_REPO_|TRAVIS_BUILD_|TRAVIS_BRANCH|TRAVIS_PULL_REQUEST_|APPVEYOR_|CSC_|GH_|GITHUB_|BT_|AWS_|STRIP|BUILD_') \
43+
# --env ELECTRON_CACHE="/root/.cache/electron" \
44+
# --env ELECTRON_BUILDER_CACHE="/root/.cache/electron-builder" \
45+
# -v ${PWD}:/project \
46+
# -v ~/.cache/electron:/root/.cache/electron \
47+
# -v ~/.cache/electron-builder:/root/.cache/electron-builder \
48+
# electronuserland/builder:wine \
49+
# /bin/bash -c "npm install && npm run electron:build -- --bundler builder --target linux"
50+
# linux_file=`ls dist/electron/Packaged/ | grep '.AppImage$'`
51+
# ./ossutil64 cp "dist/electron/Packaged/${linux_file}" "${BUCKET}/${linux_file}" -f
5252
5353
docker run --rm \
5454
--env-file <(env | grep -vE '\r|\n' | grep -iE 'DEBUG|NODE_|ELECTRON_|YARN_|NPM_|CI|CIRCLE|TRAVIS_TAG|TRAVIS|TRAVIS_REPO_|TRAVIS_BUILD_|TRAVIS_BRANCH|TRAVIS_PULL_REQUEST_|APPVEYOR_|CSC_|GH_|GITHUB_|BT_|AWS_|STRIP|BUILD_') \
@@ -58,9 +58,10 @@ script:
5858
-v ~/.cache/electron:/root/.cache/electron \
5959
-v ~/.cache/electron-builder:/root/.cache/electron-builder \
6060
electronuserland/builder:wine \
61-
/bin/bash -c "npm install && npm run electron:build -- --bundler builder --target win"
62-
win_file=`ls dist/electron/Packaged/ | grep '.zip$'`
63-
./ossutil64 cp "dist/electron/Packaged/${win_file}" "${BUCKET}/${win_file}" -f
61+
/bin/bash -c "npm install && npm run electron:build -- --linux --win"
62+
ls dist/electron/Packaged/
63+
# win_file=`ls dist/electron/Packaged/ | grep '.zip$'`
64+
# ./ossutil64 cp "dist/electron/Packaged/${win_file}" "${BUCKET}/${win_file}" -f
6465
else
6566
npm run electron:build
6667
osx_file=`ls dist/electron/Packaged/ | grep '.dmg$'`
@@ -72,4 +73,4 @@ before_cache:
7273

7374
branches:
7475
except:
75-
- 'dev'
76+
- 'master'

quasar.conf.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,15 @@ module.exports = function (ctx) {
208208
target: 'dmg',
209209
},
210210
win: {
211-
target: 'zip',
211+
target: [
212+
{
213+
target: 'zip',
214+
arch: [
215+
'x64',
216+
'ia32',
217+
],
218+
},
219+
],
212220
},
213221
linux: {
214222
target: 'AppImage',

0 commit comments

Comments
 (0)