Skip to content

Commit

Permalink
Merge pull request #34 from Azure-Samples/fix-travis3
Browse files Browse the repository at this point in the history
Fix travis3
  • Loading branch information
liliankasem authored May 16, 2018
2 parents f4e169d + 76edeac commit 6077cd5
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 3 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ node_js:
install:
- npm install
deploy:
- provider: script
script: env | sort
- provider: script
skip_cleanup: true
script: sh .travis/pu.sh
Expand Down
16 changes: 14 additions & 2 deletions .travis/pu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,21 @@ upload_files() {
# This pushes the new tag
git push --tags --dry-run
}

check_release() {
if [ "${TRAVIS_PULL_REQUEST}" != "false" ]; then
echo "this IS a PR to deploy"
echo "script will continue..."
else
echo "this is NOT a PR"
exit 0
fi
}

echo "####### the env is..."
env
env | sort | grep TRAVIS
echo "####### end env"
check_release
setup_git
make_version
upload_files
upload_files
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-aad-msal",
"version": "0.3.13",
"version": "0.3.15",
"description": "A react component that integrates with Azure AD (v2, MSAL).",
"private": false,
"license": "MIT",
Expand Down

0 comments on commit 6077cd5

Please sign in to comment.