Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions build/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,19 @@ push_to_github() {
fi
}

tag_release_on_github() {
if yarn run github-release; then
echo "----------------------------------------------------------------------"
echo "Pushing new GitHub release succuessfully"
echo "----------------------------------------------------------------------"
else
echo "----------------------------------------------------------------------"
echo "Error pushing new GitHub release"
echo "----------------------------------------------------------------------"
exit 1
fi
}

move_reports() {
echo "--------------------------------------------------------------------------"
echo "Moving test reports to ./reports/cobertura.xml and ./reports/junit.xml"
Expand Down Expand Up @@ -211,10 +224,12 @@ push_new_release() {
fi

# Push GitHub release
echo "----------------------------------------------------------------------"
echo "Pushing new GitHub release"
echo "----------------------------------------------------------------------"
./node_modules/.bin/conventional-github-releaser
if ! tag_release_on_github; then
echo "----------------------------------------------------"
echo "Error in tag_release_on_github!"
echo "----------------------------------------------------"
exit 1
fi
}

# Check if we are doing major, minor, or patch release
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
"npm": "webpack -p --progress --colors --config build/webpack.npm.config.js",
"clean": "rm -rf dist && rm -rf lib && rm -rf reports/coverage && rm -rf src/i18n/json",
"changelog": "./node_modules/.bin/conventional-changelog -i CHANGELOG.md -s -r 0",
"github-release": "./node_modules/.bin/conventional-github-releaser",
"prettier": "prettier-eslint --print-width 120 --tab-width 4 --single-quote --semi --write --bracket-spacing true \"src/**/*.js\"",
"commitmsg": "conventional-changelog-lint -e",
"prepush": "yarn run lint && yarn run flow && yarn run test",
Expand Down
2 changes: 1 addition & 1 deletion src/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ export const DELIMITER_SLASH: 'slash' = 'slash';
export const DELIMITER_CARET: 'caret' = 'caret';

/* ---------------------- Defaults -------------------------- */
export const DEFAULT_PREVIEW_VERSION = '1.11.0';
export const DEFAULT_PREVIEW_VERSION = '1.12.0';
export const DEFAULT_PREVIEW_LOCALE = 'en-US';
export const DEFAULT_PATH_STATIC = 'platform/elements';
export const DEFAULT_PATH_STATIC_PREVIEW = 'platform/preview';
Expand Down
2 changes: 1 addition & 1 deletion test/preview.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
window.onload = function() {
const { ContentExplorer } = Box;
const explorer = new ContentExplorer();
explorer.show('0', '7F3tLTWAqInxn3ZEeAYSeM2KzFqraCHy', {
explorer.show('0', 'dcs5EcLt7cxE7IH7dpZ8af6zfwL1JKDE', {
hasPreviewSidebar: true
});
}
Expand Down