Skip to content

Commit

Permalink
Merge branch 'v1.3-bugfix' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
taye committed May 15, 2018
2 parents 8796735 + f821d64 commit dfaf67b
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 8 deletions.
25 changes: 18 additions & 7 deletions build/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,12 @@ bump_version() {
echo_funcname

# bump the version in package.json
NEW_VERSION=$(node build/bump $NEW_VERSION)
NEW_VERSION=$(node packages/_dev/build/bump $NEW_VERSION)

if [[ -z $NEW_VERSION ]]; then
quit "failed to bump version" 1
fi

NEW_TAG="v$(semver clean $NEW_VERSION)"

# if the version tag already exists
Expand Down Expand Up @@ -82,12 +87,18 @@ commit_and_tag() {
push_and_publish() {
echo_funcname

# push branch and tags to git origin and publish to npm
git tag --force next &&
git push --no-verify &&
git push --no-verify origin $NEW_TAG &&
git push --no-verify -f origin next &&
npm publish --tag next
# push branch and tags to git origin
git push --no-verify && git push --no-verify origin $NEW_TAG &&

if [[ $NEW_VERSION == "prerelease" ]]; then
# publish to npm with "next" tag
git tag --force next &&
git push --no-verify -f origin next &&
npm publish --tag next
else
# publish with default "latest" tag
npm publish
fi
}

echo_funcname() {
Expand Down
2 changes: 1 addition & 1 deletion src/Interaction.js
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ function onDocSignal ({ doc }, signalName) {
}

for (const eventType in docEvents) {
eventMethod(doc, eventType, docEvents[eventType]);
eventMethod(doc, eventType, docEvents[eventType], browser.isIOS ? { passive: false } : undefined);
}
}

Expand Down

0 comments on commit dfaf67b

Please sign in to comment.