Merge pull request #893 from microsoft/fix-nightly-build-settings

Fix nightly build settings

.travis.yml

@@ -21,7 +21,9 @@ env:
     - ISPRODTAG=^v?[0-9]+\.[0-9]+\.[0-9]+$
     - ISTESTTAG=^v?[0-9]+\.[0-9]+\.[0-9]+-[rR][cC]
     - RC_EXTENSION_ID="iotdevexbuild.test-owl-project"
-    - NIGHTLY_BUILD_ID="vsciot-vscode.vscode-iot-workbench-nightly"
+    - NIGHTLY_BUILD_ID="iotdevexbuild.test-owl-project-nightly"
+    # Non production situation: RC or nightly build
+    - IS_TEST=true
 
 install:
 - sudo apt-get install libsecret-1-dev
@@ -33,7 +35,7 @@ script:
 - gts --version
 - gts check
 - node scripts/updateConfig.js
-- vsce package
+- if [[ $TRAVIS_TAG =~ $ISPRODTAG ]]; then export IS_TEST=false; fi
 - if [[ $TRAVIS_EVENT_TYPE == "cron" ]]; then
     git config --local user.name $USER_NAME &&
     git config --local user.email $USER_EMAIL &&
@@ -42,12 +44,14 @@ script:
     nightlyBuildTagExists=`git ls-remote --exit-code origin refs/tags/$TRAVIS_TAG` && nightlyBuildCommit=`git rev-list -n 1 $TRAVIS_TAG` &&
     if [[ $nightlyBuildTagExists && $nightlyBuildCommit != $TRAVIS_COMMIT ]]; then git push --delete origin $TRAVIS_TAG && git tag -f $TRAVIS_TAG && git push --tags -f; fi
   fi
+- vsce package
 - docker run -ti --rm -v $PWD:/mnt:ro dkhamsing/awesome_bot --allow-dupe --allow-redirect --skip-save-results `ls *.md`
 
 deploy:
   # deploy to github release
   - provider: releases
     api_key: $GIT_TOKEN
+    prerelease: $IS_TEST
     file_glob: true
     file: "*.vsix"
     skip_cleanup: true
@@ -57,6 +61,7 @@ deploy:
   # deploy nightly build to github release
   - provider: releases
     api_key: $GIT_TOKEN
+    prerelease: true
     overwrite: true
     file_glob: true
     file: "*.vsix"
@@ -84,7 +89,7 @@ deploy:
       condition: "$TRAVIS_TAG =~ $ISTESTTAG"
   # deploy nightly version to vscode extension market
   - provider: script
-    script: yes | vsce unpublish -p $VSCE_TOKEN $NIGHTLY_BUILD_ID && vsce publish -p $VSCE_TOKEN --packagePath *.vsix
+    script: yes | vsce unpublish -p $VSCE_TEST_TOKEN $NIGHTLY_BUILD_ID && vsce publish -p $VSCE_TEST_TOKEN --packagePath *.vsix
     skip_cleanup: true
     on:
       branch: develop

package.json

@@ -10,7 +10,7 @@
     "url": "https://github.com/Microsoft/vscode-iot-workbench/issues"
   },
   "homepage": "https://github.com/Microsoft/vscode-iot-workbench/blob/master/README.md",
-  "version": "0.10.17",
+  "version": "0.11.0-rc",
   "publisher": "vsciot-vscode",
   "icon": "logo.png",
   "license": "SEE LICENSE IN <LICENSE>",