Merge pull request #2258 from Azure/master

Merge master into stable for release 2.8.0

Author: cRui861

.github/CODEOWNERS

@@ -0,0 +1,9 @@
+# These owners will be the default owners for everything in
+# the repo. Unless a later match takes precedence,
+# they will be requested for review when someone opens a 
+# pull request.
+
+*       @bgklein  @cRui861  @dpwatrous  @paterasMSFT  @gingi
+
+# Builds
+/.vsts/ @bgklein  @cRui861  @dpwatrous

.gitignore

@@ -12,6 +12,7 @@ coverage/
 .nyc_output/
 coverage.lcov
 documentation/
+.python-version
 
 # Ignore the english compiled file
 i18n/resources.en.json

.vscode/launch.json

@@ -2,23 +2,22 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "name": "Launch",
+      "name": "Debug: Main",
       "type": "node",
       "request": "launch",
       "protocol": "inspector",
       "program": "${workspaceRoot}/src/client/main.ts",
       "stopOnEntry": false,
-      "args": [],
+      "args": [
+        "--remote-debugging-port=9222",
+        "--nolazy"
+      ],
       "cwd": "${workspaceRoot}",
       "preLaunchTask": "build-client",
       "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron",
       "windows": {
         "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron.cmd"
       },
-      "runtimeArgs": [
-        "--remote-debugging-port=9222",
-        "--nolazy"
-      ],
       "env": {
         "NODE_ENV": "development",
         "HOT": "1"
@@ -28,17 +27,62 @@
       "sourceMaps": true,
       "outFiles": [
         "${workspaceRoot}/build/**/*.js"
-      ]
+      ],
+      "presentation": {
+          "hidden": false,
+          "group": "Debug",
+          "order": 20
+      }
     },
     {
-      "name": "Attach to Process",
+      "name": "Attach: Renderer",
       "type": "chrome",
       "request": "attach",
       "port": 9222,
       "sourceMaps": true,
       "trace": "verbose",
       "url": "file://*",
-      "webRoot": "${workspaceRoot}/build"
+      "webRoot": "${workspaceRoot}/build",
+      "timeout": 30000,
+      "presentation": {
+        "hidden": false,
+        "group": "Debug",
+        "order": 30
+      }
+    },
+    {
+      "name": "Test: Client",
+      "type": "node",
+      "request": "launch",
+      "protocol": "inspector",
+      "program": "${workspaceRoot}/test/client/run-jasmine.js",
+      "cwd": "${workspaceRoot}",
+      "runtimeExecutable": "node",
+      "runtimeArgs": [
+        "--nolazy"
+      ],
+      "env": {
+        "NODE_ENV": "test"
+      },
+      "presentation": {
+        "hidden": false,
+        "group": "Test",
+        "order": 10
+      }
+    }
+  ],
+  "compounds": [
+    {
+        "name": "Debug: All",
+        "configurations": [
+            "Debug: Main",
+            "Attach: Renderer"
+        ],
+        "presentation": {
+            "hidden": false,
+            "group": "Debug",
+            "order": 10
+        }
     }
   ]
 }

.vsts/darwin/ci.yml

@@ -1,6 +1,9 @@
 steps:
   - template: ./darwin-dependencies.yml
-  - script: npm run build-and-pack
+  - script: |
+      set -e
+      . "$(Agent.WorkFolder)/.venv/batchexplorer/bin/activate"
+      npm run build-and-pack
     displayName: Build and pack
   - template: ../common/publish-artifacts.yml
     parameters:

.vsts/darwin/darwin-dependencies.yml

@@ -1,17 +1,12 @@
 steps:
   - template: ../dependencies.yml
-  - script: npm config set python $(which python)
-    displayName: Set npm python2 path
   - template: ../pyenv.yml
   - script: |
       set -e
-      node --version
-      npm config list
-      npm install -g npm@latest
-      npm --version
-      npm install -g node-gyp node-pre-gyp
-      npm i --save-dev node@8.15.0
-      npm install
-      pip install --upgrade pip
+      . "$(Agent.WorkFolder)/.venv/batchexplorer/bin/activate"
+      python --version
       pip install -r python/requirements.txt
-    displayName: Install dependencies
+      echo "Node.js version $(node --version)"
+      echo "NPM version $(npm --version)"
+      npm ci
+    displayName: Install MacOS dependencies

.vsts/darwin/distribution.yml

@@ -1,6 +1,8 @@
 steps:
   - template: ./darwin-dependencies.yml
   - script: |
+      set -e
+      . "$(Agent.WorkFolder)/.venv/batchexplorer/bin/activate"
       npm run -s build:prod
       npm run -s build-python
       npm run -s package darwin-app
@@ -14,6 +16,8 @@ steps:
 
   - template: ./sign.yml
   - script: |
+      set -e
+      . "$(Agent.WorkFolder)/.venv/batchexplorer/bin/activate"
       unzip ./release/BatchExplorer*.zip -d ./release/mac
       ls ./release/mac
       rm -f ./release/mac/*.pkg

.vsts/dependencies.yml

@@ -1,7 +1,7 @@
 steps:
-  - powershell: ./scripts/azpipelines/build-type.ps1 "$(Build.SourceBranch)"
+  - powershell: ./scripts/azpipelines/build-type.ps1 "$(Build.SourceBranch)" "$(Build.BuildNumber)"
     displayName: Resolve build type
 
   - task: NodeTool@0
     inputs:
-      versionSpec: '10.11.x'
+      versionSpec: '12.18.x'

.vsts/distribution.yml

@@ -2,13 +2,13 @@
 jobs:
   - job: Linux
     pool:
-      vmImage: ubuntu-16.04
+      vmImage: ubuntu-18.04
     steps:
        - template: ./linux/distribution.yml
 
   - job: MacOS
     pool:
-      vmImage: macOS-10.14
+      vmImage: macOS-10.15
       demands: xcode
     steps:
        - template: ./darwin/distribution.yml

.vsts/linux/ci.yml

@@ -6,7 +6,7 @@ steps:
 
   - script: |
       export DISPLAY=:99
-      xvfb-run npm run test
+      xvfb-run --server-args '-screen 0 1024x768x24' npm run test
     displayName: Run tests
 
   - task: PublishTestResults@2
@@ -22,7 +22,10 @@ steps:
   - script: codecov -t $(codecov.uploadToken)
     displayName: Upload code coverage to codecov
 
-  - script: npm run build-and-pack
+  - script: |
+      set -e
+      . "$(Agent.WorkFolder)/.venv/batchexplorer/bin/activate"
+      npm run build-and-pack
     displayName: Build and pack
 
   - script: npm run lint

.vsts/linux/distribution.yml

@@ -1,8 +1,14 @@
 steps:
   - template: ./linux-dependencies.yml
-  - script: npm run build-and-pack
+  - script: |
+      set -e
+      . "$(Agent.WorkFolder)/.venv/batchexplorer/bin/activate"
+      npm run build-and-pack
     displayName: Build and pack
-  - script: npm run package linux-manifest
+  - script: |
+      set -e
+      . "$(Agent.WorkFolder)/.venv/batchexplorer/bin/activate"
+      npm run package linux-manifest
     displayName: Create manifest
   - template: ../common/publish-artifacts.yml
     parameters: