Merge branch 'master' of https://github.com/vscodium/vscodium

change vscodium to codium in debian postinst

.travis.yml

@@ -13,7 +13,7 @@ matrix:
     - os: osx
 
 language: node_js
-node_js: "8"
+node_js: "10"
 
 before_install:
   - curl -o- -L https://yarnpkg.com/install.sh | bash

build.sh

@@ -44,7 +44,7 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
     # unless the app name is code-oss
     # as we are renaming the application to vscodium
     # we need to edit a line in the post install template
-    sed -i "s/code-oss/vscodium/" resources/linux/debian/postinst.template
+    sed -i "s/code-oss/codium/" resources/linux/debian/postinst.template
   fi
 
   if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then

update_version.sh

@@ -136,6 +136,9 @@ git pull origin master # in case another build just pushed
 git add .
 dateAndMonth=`date "+%D %T"`
 git commit -m "Travis update: $dateAndMonth (Build $TRAVIS_BUILD_NUMBER)"
-git push origin master --quiet
+if ! git push origin master --quiet; then
+  git pull origin master
+  git push origin master --quiet
+fi
 
 cd ..

win32-build.yml

@@ -1,7 +1,7 @@
 steps:
 - task: NodeTool@0 
   inputs:
-    versionSpec: '8.x'
+    versionSpec: '10.x'
 - script: |
     choco install jq 
   displayName: 'install jq from choco'