Merge pull request #70 from stripedpajamas/master

Correct GH token logic for Windows builds

.gitignore

@@ -1 +1,2 @@
 vscode
+VS*/*

.travis.yml

@@ -14,6 +14,8 @@ language: node_js
 node_js: "8"
 
 before_install:
+  - curl -o- -L https://yarnpkg.com/install.sh | bash
+  - export PATH="$HOME/.yarn/bin:$PATH"
   - ./install_deps.sh
   - . get_repo.sh
   - . check_tags.sh

README.md

@@ -1,9 +1,19 @@
-# VSCodium
+<div id="vscodium-logo" align="center">
+    <br />
+    <img src="./src/resources/linux/code.png" alt="VSCodium Logo" width="200"/>
+    <h1>VSCodium</h1>
+    <h3>Free/Libre Open Source Software Binaries of VSCode</h3>
+</div>
 
-### Free/Libre Open Source Software Binaries of VSCode
+<div id="badges" align="center">
+
+  [![current release](https://img.shields.io/github/release/vscodium/vscodium.svg)](https://github.com/vscodium/vscodium/releases)
+[![windows_build_status](https://dev.azure.com/vscodium/VSCodium/_apis/build/status/VSCodium.vscodium?branchName=master)](https://dev.azure.com/vscodium/VSCodium/_build?definitionId=1)
 [![build status](https://travis-ci.com/VSCodium/vscodium.svg?branch=master)](https://travis-ci.com/VSCodium/vscodium) 
-[![current release](https://img.shields.io/github/release/vscodium/vscodium.svg)](https://github.com/vscodium/vscodium/releases)
 [![license](https://img.shields.io/github/license/VSCodium/vscodium.svg)](https://github.com/VSCodium/vscodium/blob/master/LICENSE)
+[![Gitter](https://img.shields.io/gitter/room/vscodium/vscodium.svg)](https://gitter.im/VSCodium/Lobby)
+
+</div>
 
 ## Table of Contents
 - [Download/Install](#download-install)
@@ -56,8 +66,7 @@ For more information on getting all the telemetry disabled and tips for migratin
 - [x] OSX x64 (zipped app file)
 - [x] Linux x64 (`.deb`, `.rpm`, and `.tar.gz` files)
 - [x] Linux x86 (`.deb`, `.rpm`, and `.tar.gz` files)
-- [ ] Windows
+- [X] Windows
-  - The plan is to build the Windows executable with [AppVeyor](https://appveyor.com). PRs are welcome :blue_heart:
   
 The ARM architecture is not currently supported but is actively being worked on.
 

azure-pipelines.yml

@@ -0,0 +1,59 @@
+pool:
+  vmImage: 'vs2017-win2016'
+
+steps:
+- script: |
+    choco install jq 
+  displayName: 'install jq from choco'
+- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
+  displayName: 'Install Yarn'
+- task: UsePythonVersion@0
+  displayName: 'Use Python 2.x'
+  inputs:
+    versionSpec: 2.x
+- task: ShellScript@2
+  displayName: 'get VSCode sources'
+  inputs: 
+    scriptPath: get_repo.sh
+- powershell: |
+    $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'
+- task: PowerShell@2
+  inputs:
+    filePath: 'check_tags.ps1'
+  env:
+    MAPPED_GITHUB_TOKEN: $(GITHUB_TOKEN)
+- script: |
+    git -C vscode status
+  displayName: 'vscode status'
+- powershell: |
+    bash ./build.sh
+  displayName: 'go build it!'
+- bash: |
+    if [[ "$SHOULD_BUILD" == "yes" ]]; then mv vscode\\.build\\win32-x64\\system-setup\\VSCodeSetup.exe VSCodiumSetup-x64-${LATEST_MS_TAG}.exe; fi
+  displayName: 'move the system setup'
+- bash: |
+    if [[ "$SHOULD_BUILD" == "yes" ]]; then mv vscode\\.build\\win32-x64\\user-setup\\VSCodeSetup.exe VSCodiumUserSetup-x64-${LATEST_MS_TAG}.exe; fi
+  displayName: 'move the user setup'
+- bash: |
+    if [[ "$SHOULD_BUILD" == "yes" ]]; then mv vscode\\.build\\win32-x64\\archive\\VSCode-win32-x64.zip VSCodium-win32-x64-${LATEST_MS_TAG}.zip; fi
+  displayName: 'move the zip folder'
+- task: PublishBuildArtifacts@1
+  displayName: 'Publish artifacts: system-setup'
+  condition: eq(variables['SHOULD_BUILD'], 'yes')
+  inputs:
+    PathtoPublish: 'VSCodiumSetup-x64-$(LATEST_MS_TAG).exe'
+    ArtifactName: 'system_setup'
+- task: PublishBuildArtifacts@1
+  displayName: 'Publish artifacts: user-setup'
+  condition: eq(variables['SHOULD_BUILD'], 'yes')
+  inputs:
+    PathtoPublish: 'VSCodiumUserSetup-x64-$(LATEST_MS_TAG).exe'
+    ArtifactName: 'user_setup'
+- task: PublishBuildArtifacts@1
+  displayName: 'Publish artifacts: archive'
+  condition: eq(variables['SHOULD_BUILD'], 'yes')
+  inputs:
+    PathtoPublish: 'VSCodium-win32-x64-$(LATEST_MS_TAG).zip'
+    ArtifactName: 'archive'

build.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-
 if [[ "$SHOULD_BUILD" == "yes" ]]; then
   cp -rp src/* vscode/
   cd vscode
@@ -7,7 +6,6 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
   if [[ "$BUILDARCH" == "ia32" ]]; then
     export npm_config_arch=ia32
   fi
-
   ../update_settings.sh
 
   yarn
@@ -18,28 +16,37 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
 
   export NODE_ENV=production
 
-  if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then
+  if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
     # microsoft adds their apt repo to sources
     # 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
-  fi
+    fi
 
   if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
     npm run gulp vscode-darwin-min
   elif [[ "$BUILDARCH" == "ia32" ]]; then
-    npm run gulp vscode-linux-ia32-min
+      npm run gulp vscode-linux-ia32-min
-    npm run gulp vscode-linux-ia32-build-deb
+      npm run gulp vscode-linux-ia32-build-deb
-    npm run gulp vscode-linux-ia32-build-rpm
+      npm run gulp vscode-linux-ia32-build-rpm
-    unset npm_config_arch
+      unset npm_config_arch
   elif [[ "$BUILDARCH" == "arm64" ]]; then
     npm run gulp vscode-linux-arm64-min
     npm run gulp vscode-linux-arm64-build-deb
     # npm run gulp vscode-linux-arm64-build-rpm
+  elif [[ "$CI_WINDOWS" == "True" ]]; then
+    npx gulp vscode-win32-x64-min
+    npx gulp vscode-win32-x64-copy-inno-updater
+    npx gulp vscode-win32-x64-inno-updater
+    npx gulp vscode-win32-x64-system-setup
+    npx gulp vscode-win32-x64-user-setup
+    npx gulp vscode-win32-x64-archive
   else
     npm run gulp vscode-linux-x64-min
     npm run gulp vscode-linux-x64-build-deb
     npm run gulp vscode-linux-x64-build-rpm
-  fi
+  fi  
+
+  cd ..
 fi

check_tags.ps1

@@ -0,0 +1,34 @@
+echo "tag: $env:LATEST_MS_TAG"
+$GITHUB_RESPONSE = curl.exe -s -H "Authorization: token $env:MAPPED_GITHUB_TOKEN" "https://api.github.com/repos/vscodium/vscodium/releases/tags/$env:LATEST_MS_TAG"
+echo "Github response: ${GITHUB_RESPONSE}"
+$VSCODIUM_ASSETS= $GITHUB_RESPONSE | jq '.assets'
+echo "VSCodium assets: ${VSCODIUM_ASSETS}"
+
+# if we just don't have the github token, get out fast
+if (!$env:MAPPED_GITHUB_TOKEN -or $env:MAPPED_GITHUB_TOKEN -like "*GITHUB_TOKEN*") {
+  echo "This build does not have the GH token"
+  echo $env:MAPPED_GITHUB_TOKEN
+  return
+}
+
+if (!$VSCODIUM_ASSETS) {
+  echo "Release assets do not exist at all, continuing build"
+  $SHOULD_BUILD = 'yes'
+}
+
+$WindowsAssets = ($VSCODIUM_ASSETS | ConvertFrom-Json) | Where-Object { $_.name.Contains('exe') }
+$SYSTEM_SETUP = $WindowsAssets | Where-Object { $_.name.Contains('Setup') }
+$USER_SETUP = $WindowsAssets | Where-Object { $_.name.Contains('User') }
+if (!$SYSTEM_SETUP) {
+  echo "Building on Windows because we have no system-setup.exe";
+  $SHOULD_BUILD = 'yes'
+}
+elseif (!$USER_SETUP) {
+  echo "Building on Windows because we have no user-setup.exe";
+  $SHOULD_BUILD = 'yes'
+}
+else {
+  echo "Already have all the Windows builds"
+}
+
+Write-Host "##vso[task.setvariable variable=SHOULD_BUILD]$SHOULD_BUILD"

install_deps.sh

@@ -2,7 +2,6 @@
 
 if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
   brew update
-  brew install yarn --without-node
   brew install jq zip
 else
   sudo apt-get update