Skip to content

Commit

Permalink
Auto-merge for PR #58 via VersionBot
Browse files Browse the repository at this point in the history
chore(scripts): Run CI on x86 as well
  • Loading branch information
resin-io-modules-versionbot[bot] authored Oct 19, 2017
2 parents cb36acc + ec674c8 commit def990f
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 10 deletions.
7 changes: 7 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,13 @@ env:
- CCACHE_COMPRESS=1
- CC="clang"
- CXX="clang++"
matrix:
- TARGET_ARCH=x64
- TARGET_ARCH=x86
matrix:
exclude:
- os: osx
env: TARGET_ARCH=x86
addons:
apt:
sources:
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file
automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
This project adheres to [Semantic Versioning](http://semver.org/).

## v1.3.5 - 2017-10-19

* Chore(scripts): Run CI on x86 as well #58 [Jonas Hermsmeier]

## v1.3.4 - 2017-10-18

* Chore(scripts): Also prebuild x86 on Windows and Linux #57 [Jonas Hermsmeier]
Expand Down
5 changes: 4 additions & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,11 @@ cache:
- '%AppData%\npm-cache'

environment:
global:
nodejs_version: 6
matrix:
- nodejs_version: 6
- TARGET_ARCH: x64
- TARGET_ARCH: x86

install:
- ps: Install-Product node $env:nodejs_version x64
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mountutils",
"version": "1.3.4",
"version": "1.3.5",
"main": "index.js",
"description": "Cross platform mount related utilities",
"homepage": "https://github.com/resin-io-modules/mountutils",
Expand Down
3 changes: 1 addition & 2 deletions scripts/prebuild-publish.bat
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

if %APPVEYOR_REPO_BRANCH% == master (
if %GITHUB_TOKEN% neq "" (
npm run prebuild -- --arch x64 -u %GITHUB_TOKEN%
npm run prebuild -- --arch x86 -u %GITHUB_TOKEN%
npm run prebuild -- -u %GITHUB_TOKEN%
)
)
7 changes: 1 addition & 6 deletions scripts/prebuild-publish.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
#!/bin/bash

PLATFORM=$(node -p process.platform)

if [[ $GITHUB_TOKEN ]]; then
npm run prebuild -- --arch x64 -u "$GITHUB_TOKEN"
if [[ $PLATFORM == "linux" ]]; then
npm run prebuild -- --arch x86 -u "$GITHUB_TOKEN"
fi
npm run prebuild -- -u "$GITHUB_TOKEN"
fi

0 comments on commit def990f

Please sign in to comment.