Merge pull request #233 from stripedpajamas/fix-hash-paths

Fix hash paths

.travis.yml

@@ -3,10 +3,6 @@ matrix:
     - os: linux
       sudo: required
       env: BUILDARCH=x64
-# arm64 builds don't work yet
-#    - os: linux
-#      sudo: required
-#      env: BUILDARCH=arm64
     - os: osx
 
 language: node_js
@@ -41,12 +37,9 @@ deploy:
     - ./*.zip
     - ./*.tar.gz
     - ./*.dmg
-    - vscode/.build/linux/deb/i386/deb/*.deb
-    - vscode/.build/linux/rpm/i386/*.rpm
-    - vscode/.build/linux/deb/amd64/deb/*.deb
-    - vscode/.build/linux/rpm/x86_64/*.rpm
-    - vscode/.build/linux/deb/arm64/deb/*.deb
-    - vscode/out/*.AppImage
+    - ./*.deb
+    - ./*.rpm
+    - ./*.AppImage
   on:
     all_branches: true
     condition: $SHOULD_BUILD = yes

sum.sh

@@ -27,13 +27,13 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
     sum_file VSCodiumUserSetup-*.exe
     sum_file VSCodium-win32-*.zip
   else # linux
-    sum_file vscode/out/*.AppImage
-    sum_file VSCodium-linux*.tar.gz
-    sum_file vscode/.build/linux/deb/amd64/deb/*.deb
-    sum_file vscode/.build/linux/rpm/x86_64/*.rpm
+    cp vscode/out/*.AppImage .
+    cp vscode/.build/linux/deb/amd64/deb/*.deb .
+    cp vscode/.build/linux/rpm/x86_64/*.rpm .
 
-    cp vscode/out/*.{sha256,sha1} .
-    cp vscode/.build/linux/deb/amd64/deb/*.{sha256,sha1} .
-    cp vscode/.build/linux/rpm/x86_64/*.{sha256,sha1} .
+    sum_file *.AppImage
+    sum_file VSCodium-linux*.tar.gz
+    sum_file *.deb
+    sum_file *.rpm
   fi
 fi

update_version.sh

@@ -92,8 +92,8 @@ updateLatestVersion() {
 # thank you https://www.vinaygopinath.me/blog/tech/commit-to-master-branch-on-github-using-travis-ci/
 git clone https://github.com/${VERSIONS_REPO}.git
 cd versions
-git config user.email "travis@travis-ci.org"
-git config user.name "Travis CI"
+git config user.email "vscodium-ci@not-real.com"
+git config user.name "VSCodium CI"
 git remote rm origin
 git remote add origin https://${GITHUB_USERNAME}:${GITHUB_TOKEN}@github.com/${VERSIONS_REPO}.git > /dev/null 2>&1
 cd ..
@@ -105,8 +105,11 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
   JSON="$(generateJson ${ASSET_NAME})"
   updateLatestVersion "$VERSION_PATH" "$JSON"
 elif [[ "$CI_WINDOWS" == "True" ]]; then
-  # windows update service supports user and archive types
-  # so we will run the commands twice
+  # system installer
+  ASSET_NAME=VSCodiumSetup-${BUILDARCH}-${LATEST_MS_TAG}.exe
+  VERSION_PATH="win32/${BUILDARCH}/system"
+  JSON="$(generateJson ${ASSET_NAME})"
+  updateLatestVersion "$VERSION_PATH" "$JSON"
 
   # user installer
   ASSET_NAME=VSCodiumUserSetup-${BUILDARCH}-${LATEST_MS_TAG}.exe