Merge pull request #812 from Azure/master

Merge publishing fix to stable

Author: timotheeguerin

.travis.yml

@@ -8,11 +8,13 @@ addons:
       - libgnome-keyring-dev
       - icnsutils
       - graphicsmagick
+      - libreadline6
       - xz-utils
       - rpm
       - bsdtar
+
 node_js:
-  - '6.9.4'
+  - '6.11.4'
 python:
   - "3.6"
 
@@ -30,6 +32,9 @@ matrix:
         - virtualenv env -p python3
         - source env/bin/activate
         - python3 --version
+        - nvm install 6.11.4
+        - nvm use 6.11.4
+
     - language: node_js
       os: linux
       before_install:
@@ -59,6 +64,7 @@ branches:
   only:
   - master
   - stable
+  - fix/publish
 
 cache:
   directories:

app/components/base/form/form-picker/form-picker.component.ts

@@ -56,6 +56,11 @@ export class FormPickerComponent implements ControlValueAccessor, Validator {
         this.nestedValue.setValue(null);
         const page = this._getPage();
         this.hasValue = false;
+
+        if (this._propagateChange) {
+            this._propagateChange(null);
+        }
+
         if (page) {
             page.formGroup.reset();
         }

appveyor.yml

@@ -24,7 +24,7 @@ install:
   # about it being out of date.
   - "pip install --disable-pip-version-check --user --upgrade pip"
 
-  - ps: Install-Product node 6.9.1 x64
+  - ps: Install-Product node 6.11.4 x64
   - npm install -g npm -s
   - npm install -g yarn -s
   - yarn install --force

electron-builder.yml

@@ -43,6 +43,7 @@ nsis:
 
 # Linux configuration
 linux:
+  category: Development
   target:
     - "AppImage"
     - "deb"
@@ -54,3 +55,4 @@ directories:
 
 publish:
   provider: "github"
+  # releaseType: draft

package.json

@@ -71,7 +71,7 @@
     "css-loader": "~0.28.0",
     "devtron": "^1.4.0",
     "electron": "~1.6.15",
-    "electron-builder": "~19.37.2",
+    "electron-builder": "~19.24.1",
     "extract-text-webpack-plugin": "~3.0.1",
     "file-loader": "~1.1.5",
     "html-webpack-plugin": "^2.28.0",
@@ -127,7 +127,7 @@
     "core-decorators": "~0.20.0",
     "d3": "~4.10.2",
     "download": "~6.2.5",
-    "electron-updater": "^2.10.0",
+    "electron-updater": "~2.15.0",
     "element-resize-detector": "^1.1.9",
     "extract-zip": "~1.6.5",
     "font-awesome": "^4.7.0",

scripts/travis/build-and-test.sh

@@ -19,21 +19,24 @@ if [ "${TRAVIS_BRANCH}" = "stable" ]; then
   # Check third party notices is up to date
   npm run ts -s scripts/lca/generate-third-party -- --check
 fi
-
+# TODO revert fix/publish to stable
 if [ "${TRAVIS_PULL_REQUEST}" = "false" ] || [ "${TRAVIS_BRANCH}" = "stable" ]; then
 
     # Build for production
 	npm run -s build:prod
     npm run -s build-python
-    npm run package -- --publish never # TODO replace with this
+
+    # Only package if on stable branch
+    if [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_BRANCH}" = "stable" ]; then
+        npm run package -- --publish always --draft
+    else
+        npm run package -- --publish never # TODO replace with this
+    fi
+    ls release
 else
     if [[ $TRAVIS_OS_NAME == 'linux' ]]; then # Only run the CI checks on the linux build
         # Normal build
         npm run build -s
     fi
 fi
 
-# Only package if on stable branch
-if [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_BRANCH}" = "stable" ]; then
-    npm run package -- --publish always --draft
-fi