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
@@ -29,6 +29,7 @@ script:
 before_deploy:
   - ./sign_mac_app.sh
   - ./create_zip.sh
+  - ./create_dmg.sh
   - ./sum.sh
 
 deploy:
@@ -42,6 +43,7 @@ deploy:
     - ./*.sha256
     - ./*.zip
     - ./*.tar.gz
+    - ./*.dmg
     - vscode/.build/linux/deb/i386/deb/*.deb
     - vscode/.build/linux/rpm/i386/*.rpm
     - vscode/.build/linux/deb/amd64/deb/*.deb

README.md

@@ -40,7 +40,7 @@ If you are on a Mac and have [Homebrew](https://brew.sh/) installed:
 brew cask install vscodium
 ```
 
-_Note: if you see "App can’t be opened because it is from an unidentified developer" when opening VSCodium the first time, you can right-click the application and choose Open. This should only be required the first time opening on a Mac._
+_Note for Mac OS X Mojave users: if you see "App can't be opened because Apple cannot check it for malicious software" when opening VSCodium the first time, you can right-click the application and choose Open. This should only be required the first time opening on Mojave._
 
 #### <a id="install-with-choco"></a>Install with Chocolatey (Windows)
 If you use Windows and have [Chocolatey](https://chocolatey.org) installed (thanks to [@Thilas](https://github.com/Thilas)):
@@ -87,14 +87,22 @@ Microsoft's build process does download additional files. This was brought up in
   - ffmpeg
 
 ## <a id="more-info"></a>More Info
+
+### Documentation
 For more information on getting all the telemetry disabled and tips for migrating from Visual Studio Code to VSCodium, have a look at this [Docs](https://github.com/VSCodium/vscodium/blob/master/DOCS.md) page.
 
+### Extension Licensing
 Please note that some Visual Studio Code extensions have licenses that restrict their use to the official Visual Studio Code builds and therefore do not work with VSCodium. See [this note](https://github.com/VSCodium/vscodium/blob/master/DOCS.md#proprietary-debugging-tools) on the Docs page for what's been found so far and possible workarounds.
 
+### How do are the VSCodium binaries built?
+If you would like to see the commands we run to build `vscode` into VSCodium binaries, have a look at the [`.travis.yml` file](https://github.com/VSCodium/vscodium/blob/master/.travis.yml) (for Linux and OS X builds) and the [`win32-build.yml` file](https://github.com/VSCodium/vscodium/blob/master/win32-build.yml) (for Windows builds). These build files call all the other scripts in the repo. If you find something that doesn't make sense, feel free to ask about it [on Gitter](https://gitter.im/VSCodium/Lobby).
+
+The builds are run every day, but exit early if there isn't a new release from Microsoft. To examine the build logs, go [here for Linux / OS X](https://travis-ci.com/VSCodium/vscodium) and [here for Windows](https://dev.azure.com/vscodium/VSCodium/_build?definitionId=1)
+
 ## <a id="supported-os"></a>Supported OS
-- [x] OSX x64 (zipped app file)
-- [x] Linux x64 (`.deb`, `.rpm`, `AppImage`, and `.tar.gz` files)
-- [x] Linux x86 (`.deb`, `.rpm`, and `.tar.gz` files)
+- [x] OS X (`zip`, `dmg`)
+- [x] Linux x64 (`deb`, `rpm`, `AppImage`, `tar.gz`)
+- [x] Linux x86 (`deb`, `rpm`, `tar.gz`)
 - [x] Windows x64
 - [x] Windows x86
   

VSCodium-AppImage-Recipe.yml

@@ -12,7 +12,7 @@ ingredients:
     - code
     - libgconf2-4
   dist: trusty
-  sources: 
+  sources:
     - deb http://archive.ubuntu.com/ubuntu/ trusty main universe
   script:
     - pwd
@@ -32,4 +32,4 @@ script:
   - convert vscodium.png -resize 32x32 usr/share/icons/hicolor/32x32/apps/vscodium.png
   - convert vscodium.png -resize 24x24 usr/share/icons/hicolor/24x24/apps/vscodium.png
   - convert vscodium.png -resize 22x22 usr/share/icons/hicolor/22x22/apps/vscodium.png
-  - ( cd usr/bin/ ; ln -s ../share/vscodium/vscodium  . )
+  - ( cd usr/bin/ ; ln -s ../share/vscodium/codium  . )

build.sh

@@ -11,11 +11,17 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
   mv product.json product.json.bak
 
   # set fields in product.json
+  extensionAllowedBadgeProviders='setpath(["extensionAllowedBadgeProviders"]; ["api.bintray.com", "api.travis-ci.com", "api.travis-ci.org", "app.fossa.io", "badge.fury.io", "badge.waffle.io", "badgen.net", "badges.frapsoft.com", "badges.gitter.im", "badges.greenkeeper.io", "cdn.travis-ci.com", "cdn.travis-ci.org", "ci.appveyor.com", "circleci.com", "cla.opensource.microsoft.com", "codacy.com", "codeclimate.com", "codecov.io", "coveralls.io", "david-dm.org", "deepscan.io", "dev.azure.com", "flat.badgen.net", "gemnasium.com", "githost.io", "gitlab.com", "godoc.org", "goreportcard.com", "img.shields.io", "isitmaintained.com", "marketplace.visualstudio.com", "nodesecurity.io", "opencollective.com", "snyk.io", "travis-ci.com", "travis-ci.org", "visualstudio.com", "vsmarketplacebadge.apphb.com", "www.bithound.io", "www.versioneye.com"])'
+  updateUrl='setpath(["updateUrl"]; "https://vscodium.now.sh")'
+  releaseNotesUrl='setpath(["releaseNotesUrl"]; "https://go.microsoft.com/fwlink/?LinkID=533483#vscode")'
+  keyboardShortcutsUrlMac='setpath(["keyboardShortcutsUrlMac"]; "https://go.microsoft.com/fwlink/?linkid=832143")'
+  keyboardShortcutsUrlLinux='setpath(["keyboardShortcutsUrlLinux"]; "https://go.microsoft.com/fwlink/?linkid=832144")'
+  keyboardShortcutsUrlWin='setpath(["keyboardShortcutsUrlWin"]; "https://go.microsoft.com/fwlink/?linkid=832145")'
   quality='setpath(["quality"]; "stable")'
   extensionsGallery='setpath(["extensionsGallery"]; {"serviceUrl": "https://marketplace.visualstudio.com/_apis/public/gallery", "cacheUrl": "https://vscode.blob.core.windows.net/gallery/index", "itemUrl": "https://marketplace.visualstudio.com/items"})'
   nameShort='setpath(["nameShort"]; "VSCodium")'
   nameLong='setpath(["nameLong"]; "VSCodium")'
-  applicationName='setpath(["applicationName"]; "vscodium")'
+  applicationName='setpath(["applicationName"]; "codium")'
   win32MutexName='setpath(["win32MutexName"]; "vscodium")'
   win32DirName='setpath(["win32DirName"]; "VSCodium")'
   win32NameVersion='setpath(["win32NameVersion"]; "VSCodium")'
@@ -25,11 +31,8 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
   win32x64UserAppId='setpath (["win32x64UserAppId"]; "{{2E1F05D1-C245-4562-81EE-28188DB6FD17}")'
   urlProtocol='setpath(["urlProtocol"]; "vscodium")'
   extensionAllowedProposedApi='setpath(["extensionAllowedProposedApi"]; getpath(["extensionAllowedProposedApi"]) + ["ms-vsliveshare.vsliveshare"])'
-  keyboardShortcutsUrlMac='setpath(["keyboardShortcutsUrlMac"]; "https://go.microsoft.com/fwlink/?linkid=832143")'
-  keyboardShortcutsUrlLinux='setpath(["keyboardShortcutsUrlLinux"]; "https://go.microsoft.com/fwlink/?linkid=832144")'
-  keyboardShortcutsUrlWin='setpath(["keyboardShortcutsUrlWin"]; "https://go.microsoft.com/fwlink/?linkid=832145")'
 
-  product_json_changes="${keyboardShortcutsUrlMac} | ${keyboardShortcutsUrlLinux} | ${keyboardShortcutsUrlWin} | ${quality} | ${extensionsGallery} | ${nameShort} | ${nameLong} | ${applicationName} | ${win32MutexName} | ${win32DirName} | ${win32NameVersion} | ${win32RegValueName} | ${win32AppUserModelId} | ${win32ShellNameShort} | ${win32x64UserAppId} | ${urlProtocol} | ${extensionAllowedProposedApi}"
+  product_json_changes="${extensionAllowedBadgeProviders} | ${updateUrl} | ${releaseNotesUrl} | ${keyboardShortcutsUrlMac} | ${keyboardShortcutsUrlLinux} | ${keyboardShortcutsUrlWin} | ${quality} | ${extensionsGallery} | ${nameShort} | ${nameLong} | ${applicationName} | ${win32MutexName} | ${win32DirName} | ${win32NameVersion} | ${win32RegValueName} | ${win32AppUserModelId} | ${win32ShellNameShort} | ${win32x64UserAppId} | ${urlProtocol} | ${extensionAllowedProposedApi}"
   cat product.json.bak | jq "${product_json_changes}" > product.json
   cat product.json
   ../undo_telemetry.sh
@@ -41,10 +44,11 @@ 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
+    npm install --global create-dmg
     npm run gulp -- "vscode-darwin-min"
   elif [[ "$CI_WINDOWS" == "True" ]]; then
     cp LICENSE.txt LICENSE.rtf # windows build expects rtf license

create_dmg.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+if [[ "$SHOULD_BUILD" == "yes" ]]; then
+  if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+    cd VSCode-darwin
+    create-dmg VSCodium.app ..
+  fi
+  cd ..
+fi

sum.sh

@@ -1,19 +1,39 @@
 #!/bin/bash
 
+# shasum blows up in Azure, so using this
+# node package which has similar syntax and identical output
+if [[ "$CI_WINDOWS" == "True" ]]; then
+  npm i -g checksum
+fi
+
 sum_file () {
   if [[ -f "$1" ]]; then
-    shasum -a 256 $1 > $1.sha256
-    shasum $1 > $1.sha1
+    if [[ "$CI_WINDOWS" == "True" ]]; then
+      checksum -a sha256 "$1" > "$1".sha256
+      checksum -a sha1 "$1" > "$1".sha1
+    else
+      shasum -a 256 "$1" > "$1".sha256
+      shasum "$1" > "$1".sha1
+    fi
   fi
 }
 
 if [[ "$SHOULD_BUILD" == "yes" ]]; then
   if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
     sum_file VSCodium-darwin-*.zip
+    sum_file VSCodium*.dmg
+  elif [[ "$CI_WINDOWS" == "True" ]]; then
+    sum_file VSCodiumSetup-*.exe
+    sum_file VSCodiumUserSetup-*.exe
+    sum_file VSCodium-win32-*.zip
   else # linux
     if [[ "$BUILDARCH" == "x64" ]]; then
       deb_arch=amd64
       rpm_arch=x86_64
+
+      # app image is x64 only
+      sum_file vscode/out/*.AppImage
+      cp vscode/out/*.{sha256,sha1} .
     elif [[ "$BUILDARCH" == "ia32" ]]; then
       deb_arch=i386
       rpm_arch=i386
@@ -21,7 +41,7 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
     sum_file VSCodium-linux*.tar.gz
     sum_file vscode/.build/linux/deb/${deb_arch}/deb/*.deb
     sum_file vscode/.build/linux/rpm/${rpm_arch}/*.rpm
-    cp vscode/.build/linux/deb/${deb_arch}/deb/*.sha256 .
-    cp vscode/.build/linux/rpm/${rpm_arch}/*.sha256 .
+    cp vscode/.build/linux/deb/${deb_arch}/deb/*.{sha256,sha1} .
+    cp vscode/.build/linux/rpm/${rpm_arch}/*.{sha256,sha1} .
   fi
 fi

update_version.sh

@@ -26,68 +26,119 @@ fi
 
 URL_BASE=https://github.com/VSCodium/vscodium/releases/download/${LATEST_MS_TAG}
 
+# to make testing on forks easier
+if [[ "$CI_WINDOWS" == "True" ]]; then
+  # BUILD_REPOSITORY_URI = e.g. https://github.com/VSCodium/vscodium
+  VERSIONS_REPO=$(echo ${BUILD_REPOSITORY_URI} | awk -F"/" '{ print $4 }')/versions
+
+  git config --global core.autocrlf true
+else
+  # TRAVIS_REPO_SLUG = e.g. VSCodium/vscodium
+  VERSIONS_REPO=$(echo ${TRAVIS_REPO_SLUG} | awk -F"/" '{ print $1 }')/versions
+fi
+
+# generateJson <assetName>
+# e.g. generateJson VSCodium-darwin-1.33.0.zip
+generateJson() {
+  local assetName=$1
+
+  # generate parts
+  local url=${URL_BASE}/${assetName}
+  local name=$LATEST_MS_TAG
+  local version=$LATEST_MS_COMMIT
+  local productVersion=$LATEST_MS_TAG
+  local timestamp=$(node -e 'console.log(Date.now())')
+
+  local sha1hash=$(cat ${assetName}.sha1 | awk '{ print $1 }')
+  local sha256hash=$(cat ${assetName}.sha256 | awk '{ print $1 }')
+
+  # check that nothing is blank (blank indicates something awry with build)
+  for key in url name version productVersion sha1hash timestamp sha256hash; do
+    if [[ "${!key}" == "" ]]; then
+      echo "Missing data for version update; exiting..."
+      exit 1
+    fi
+  done
+
+  # generate json
+  local json=$(jq \
+    --arg url             "${url}" \
+    --arg name            "${name}" \
+    --arg version         "${version}" \
+    --arg productVersion  "${productVersion}" \
+    --arg hash            "${sha1hash}" \
+    --arg timestamp       "${timestamp}" \
+    --arg sha256hash      "${sha256hash}" \
+    '. | .url=$url | .name=$name | .version=$version | .productVersion=$productVersion | .hash=$hash | .timestamp=$timestamp | .sha256hash=$sha256hash' \
+    <<<'{}')
+
+  echo "$json"
+}
+
+updateLatestVersion() {
+  cd versions
+
+  local versionPath=$1
+  local json=$2
+
+  # create/update the latest.json file in the correct location
+  mkdir -p $versionPath
+  echo $json > $versionPath/latest.json
+
+  cd ..
+}
+
+# init versions repo for later commiting + pushing the json file to it
+# 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 remote rm origin
+git remote add origin https://${GITHUB_USERNAME}:${GITHUB_TOKEN}@github.com/${VERSIONS_REPO}.git > /dev/null 2>&1
+cd ..
+
 if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
   # zip, sha1, and sha256 files are all at top level dir
-  ASSET_PATH=.
   ASSET_NAME=VSCodium-darwin-${LATEST_MS_TAG}.zip
   VERSION_PATH="darwin"
+  JSON="$(generateJson ${ASSET_NAME})"
+  updateLatestVersion "$VERSION_PATH" "$JSON"
 elif [[ "$CI_WINDOWS" == "True" ]]; then
-  # TODO: make this logic work for Windows builds too
-  # or re-implement it in PowerShell and call that from the Windows build
-  exit
+  # windows update service supports user and archive types
+  # so we will run the commands twice
+
+  # user installer
+  ASSET_NAME=VSCodiumUserSetup-${BUILDARCH}-${LATEST_MS_TAG}.exe
+  VERSION_PATH="win32/${BUILDARCH}/user"
+  JSON="$(generateJson ${ASSET_NAME})"
+  updateLatestVersion "$VERSION_PATH" "$JSON"
+
+  # windows archive
+  ASSET_NAME=VSCodium-win32-${BUILDARCH}-${LATEST_MS_TAG}.zip
+  VERSION_PATH="win32/${BUILDARCH}/archive"
+  JSON="$(generateJson ${ASSET_NAME})"
+  updateLatestVersion "$VERSION_PATH" "$JSON"
 else # linux
   # update service links to tar.gz file
   # see https://update.code.visualstudio.com/api/update/linux-x64/stable/VERSION
   # and https://update.code.visualstudio.com/api/update/linux-ia32/stable/VERSION
   # as examples
-  ASSET_PATH=.
   ASSET_NAME=VSCodium-linux-${BUILDARCH}-${LATEST_MS_TAG}.tar.gz
   VERSION_PATH="linux/${BUILDARCH}"
+  JSON="$(generateJson ${ASSET_NAME})"
+  updateLatestVersion "$VERSION_PATH" "$JSON"
 fi
 
-# generate parts
-url=${URL_BASE}/${ASSET_NAME}
-name=$LATEST_MS_TAG
-version=$LATEST_MS_COMMIT
-productVersion=$LATEST_MS_TAG
-sha1hash=$(cat ${ASSET_PATH}/${ASSET_NAME}.sha1 | awk '{ print $ 1 }')
-timestamp=$(node -e 'console.log(Date.now())')
-sha256hash=$(cat ${ASSET_PATH}/${ASSET_NAME}.sha256 | awk '{ print $ 1 }')
-
-# check that nothing is blank (blank indicates something awry with build)
-for key in url name version productVersion sha1hash timestamp sha256hash; do
-  if [[ "${!key}" == "" ]]; then
-    echo "Missing data for version update; exiting..."
-    exit 1
-  fi
-done
-
-# generate json
-JSON=$(jq \
-  --arg url             "${url}" \
-  --arg name            "${name}" \
-  --arg version         "${version}" \
-  --arg productVersion  "${productVersion}" \
-  --arg hash            "${sha1hash}" \
-  --arg timestamp       "${timestamp}" \
-  --arg sha256hash      "${sha256hash}" \
-  '. | .url=$url | .name=$name | .version=$version | .productVersion=$productVersion | .hash=$hash | .timestamp=$timestamp | .sha256hash=$sha256hash' \
-  <<<'{}')
-
-echo $JSON
-
-# clone down the current versions repo
-# create/update the latest.json file in the correct location
-# commit and push (thank you https://www.vinaygopinath.me/blog/tech/commit-to-master-branch-on-github-using-travis-ci/)
-git clone https://github.com/VSCodium/versions.git
 cd versions
-git config user.email "travis@travis-ci.org"
-git config user.name "Travis CI"
-mkdir -p $VERSION_PATH
-echo $JSON > $VERSION_PATH/latest.json
-git add $VERSION_PATH
+
+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 remote rm origin
-git remote add origin https://${GITHUB_USERNAME}:${GITHUB_TOKEN}@github.com/VSCodium/versions.git > /dev/null 2>&1
-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'
@@ -16,9 +16,11 @@ steps:
   inputs: 
     scriptPath: get_repo.sh
 - powershell: |
+    $LATEST_MS_COMMIT="$(git -C vscode rev-list --tags --max-count=1)"
     $LATEST_MS_TAG="$(git -C vscode describe --tags)"
     Write-Host "##vso[task.setvariable variable=LATEST_MS_TAG]$LATEST_MS_TAG"
-  displayName: 'set env LATEST_MS_TAG'
+    Write-Host "##vso[task.setvariable variable=LATEST_MS_COMMIT]$LATEST_MS_COMMIT"
+  displayName: 'set env LATEST_MS_TAG, LATEST_MS_COMMIT'
 - task: PowerShell@2
   inputs:
     filePath: 'check_tags.ps1'
@@ -40,9 +42,7 @@ steps:
     if [[ "$SHOULD_BUILD" == "yes" ]]; then mv vscode\\.build\\win32-$(BUILDARCH)\\archive\\VSCode-win32-$(BUILDARCH).zip VSCodium-win32-$(BUILDARCH)-${LATEST_MS_TAG}.zip; fi
   displayName: 'move the zip folder'
 - powershell: |
-    Get-FileHash VSCodiumSetup-$(BUILDARCH)-$(LATEST_MS_TAG).exe -Algorithm SHA256 | Format-List > VSCodiumSetup-$(BUILDARCH)-$(LATEST_MS_TAG).sha256
-    Get-FileHash VSCodiumUserSetup-$(BUILDARCH)-$(LATEST_MS_TAG).exe -Algorithm SHA256 | Format-List > VSCodiumUserSetup-$(BUILDARCH)-$(LATEST_MS_TAG).sha256
-    Get-FileHash VSCodium-win32-$(BUILDARCH)-$(LATEST_MS_TAG).zip -Algorithm SHA256 | Format-List > VSCodium-win32-$(BUILDARCH)-$(LATEST_MS_TAG).sha256
+    bash ./sum.sh
   condition: eq(variables['SHOULD_BUILD'], 'yes')
   displayName: 'compute sums'
 - task: CopyFiles@2
@@ -61,3 +61,8 @@ steps:
   inputs:
     PathtoPublish: $(Build.ArtifactStagingDirectory)
     ArtifactName: 'everything'
+- bash: ./update_version.sh
+  displayName: 'update version json'
+  env:
+    GITHUB_TOKEN: $(GITHUB_TOKEN)
+    GITHUB_USERNAME: $(GITHUB_USERNAME)