jeans/etcher
jeans/etcher
1
0
Fork 0
mirror of https://github.com/balena-io/etcher.git synced 2025-07-23 11:16:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(appveyor): build x86 on real x86 machines (#1912)

Browse Source 
We do this by using Appveyor's `platform` configuration variable instead
of always running on x64 and cross-compiling to x86.

Change-Type: patch
Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>
This commit is contained in:
Juan Cruz Viotti 2017-12-08 09:57:16 -04:00 committed by GitHub
parent 85c8cd6340
commit 5432363aa1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
appveyor.yml
View File

@ -19,31 +19,32 @@ environment:
global: global:
ELECTRON_NO_ATTACH_CONSOLE: true ELECTRON_NO_ATTACH_CONSOLE: true
nodejs_version: "6.10.3" nodejs_version: "6.10.3"
matrix:
- TARGET_ARCH: x64 platform:
- TARGET_ARCH: x86 - x86
- x64
matrix: matrix:
fast_finish: true fast_finish: true
install: install:
- ps: Update-NodeJsInstallation $env:nodejs_version $env:TARGET_ARCH - ps: Update-NodeJsInstallation $env:nodejs_version $env:Platform
- set PATH=C:\Program Files (x86)\Windows Kits\8.1\bin\x86;%PATH% - set PATH=C:\Program Files (x86)\Windows Kits\8.1\bin\x86;%PATH%
- set PATH=C:\Program Files (x86)\NSIS;%PATH% - set PATH=C:\Program Files (x86)\NSIS;%PATH%
- set PATH=C:\MinGW\bin;%PATH% - set PATH=C:\MinGW\bin;%PATH%
- set PATH=C:\MinGW\msys\1.0\bin;%PATH% - set PATH=C:\MinGW\msys\1.0\bin;%PATH%
- bash .\scripts\ci\install.sh -o win32 -r %TARGET_ARCH% - bash .\scripts\ci\install.sh -o win32 -r %Platform%
build: off build: off
test_script: test_script:
- node --version - node --version
- npm --version - npm --version
- bash .\scripts\ci\test.sh -o win32 -r %TARGET_ARCH% - bash .\scripts\ci\test.sh -o win32 -r %Platform%
- bash .\scripts\ci\build-installers.sh -o win32 -r %TARGET_ARCH% - bash .\scripts\ci\build-installers.sh -o win32 -r %Platform%
deploy_script: deploy_script:
- if %APPVEYOR_REPO_BRANCH%==master (bash .\scripts\ci\deploy.sh -o win32 -r %TARGET_ARCH%) - if %APPVEYOR_REPO_BRANCH%==master (bash .\scripts\ci\deploy.sh -o win32 -r %Platform%)
notifications: notifications:

3
scripts/ci/build-installers.sh
View File

@ -46,10 +46,11 @@ fi
if [ "$ARGV_OPERATING_SYSTEM" == "linux" ]; then if [ "$ARGV_OPERATING_SYSTEM" == "linux" ]; then
./scripts/build/docker/run-command.sh \ ./scripts/build/docker/run-command.sh \
-r "$TARGET_ARCH" \ -r "$ARGV_ARCHITECTURE" \
-s "$(pwd)" \ -s "$(pwd)" \
-c 'make installers-all' -c 'make installers-all'
else else
./scripts/build/check-dependency.sh make ./scripts/build/check-dependency.sh make
export TARGET_ARCH="$ARGV_ARCHITECTURE"
make installers-all make installers-all
fi fi

1
scripts/ci/deploy.sh
View File

@ -51,5 +51,6 @@ if [ "$ARGV_OPERATING_SYSTEM" == "linux" ]; then
-c "make publish-all" -c "make publish-all"
else else
./scripts/build/check-dependency.sh make ./scripts/build/check-dependency.sh make
export TARGET_ARCH="$ARGV_ARCHITECTURE"
make publish-all make publish-all
fi fi

1
scripts/ci/install.sh
View File

@ -72,6 +72,7 @@ else
npm config set progress=false npm config set progress=false
"$PIP_COMMAND" install --quiet -r requirements.txt "$PIP_COMMAND" install --quiet -r requirements.txt
export TARGET_ARCH="$ARGV_ARCHITECTURE"
make info make info
make electron-develop make electron-develop
fi fi

1
scripts/ci/test.sh
View File

@ -51,5 +51,6 @@ if [ "$ARGV_OPERATING_SYSTEM" == "linux" ]; then
-c 'xvfb-run --server-args=$XVFB_ARGS make lint test sanity-checks' -c 'xvfb-run --server-args=$XVFB_ARGS make lint test sanity-checks'
else else
./scripts/build/check-dependency.sh make ./scripts/build/check-dependency.sh make
export TARGET_ARCH="$ARGV_ARCHITECTURE"
make lint test sanity-checks make lint test sanity-checks
fi fi