Merge branch 'develop'

.dependabot/config.yml

@@ -0,0 +1,13 @@
+version: 1
+
+update_configs:
+  target_branch: "develop"
+
+  # Keep package.json (& lockfiles) up to date weekly
+  - package_manager: "javascript"
+    directory: "/"
+    update_schedule: "weekly"
+
+    default_labels:
+    - "dependencies"
+    - "dependabot"

.gitignore

@@ -19,6 +19,7 @@
 
 # misc
 .DS_Store
+.env
 .env.local
 .env.development.local
 .env.test.local
@@ -37,3 +38,8 @@ secrets.sh
 # complexity reports
 es6-src/
 report/
+
+# VoTT Server
+server/lib
+server/node_modules
+server/coverage

README.md

@@ -28,6 +28,7 @@ VoTT helps facilitate an end-to-end machine learning pipeline:
 
 <!-- toc -->
 
+
 - [VoTT (Visual Object Tagging Tool)](#vott-visual-object-tagging-tool)
   - [Table of Contents](#table-of-contents)
   - [Getting Started](#getting-started)

azure-pipelines.yml

@@ -17,7 +17,7 @@ jobs:
 
 - job: MacOS
   pool:
-    vmImage: macOS-10.13
+    vmImage: macOS-10.15
   timeoutInMinutes: 60 # how long to run the job before automatically cancelling
   steps:
   - checkout: self # self represents the repo where the initial Pipelines YAML file was found
@@ -26,7 +26,7 @@ jobs:
 
 - job: Windows
   pool:
-    vmImage: win1803
+    vmImage: "windows-2019"
   timeoutInMinutes: 60 # how long to run the job before automatically cancelling
   steps:
   - checkout: self # self represents the repo where the initial Pipelines YAML file was found

azure-pipelines/plato/generate-up-to-date-report.yml

@@ -51,7 +51,7 @@ steps:
 - task: AzureCLI@1
   displayName: "Pull down old report and add updates"
   inputs:
-    azureSubscription: 'PELITTLE TEAM - CSE DWR (d36d0808-a967-4f73-9fdc-32ea232fc81d)'
+    azureSubscription: 'pj-little-sub'
     scriptLocation: inlineScript
     inlineScript: './scripts/update-report.sh'
 

azure-pipelines/templates/build-artifact.yml

@@ -0,0 +1,28 @@
+# https://docs.microsoft.com/en-us/azure/devops/pipelines/process/templates?view=azure-devops#job-templates-with-parameters
+jobs:
+- job: ${{ parameters.name }}
+  pool: ${{ parameters.pool }}
+  timeoutInMinutes: 15 # how long to run the job before automatically cancelling
+  steps:
+    - task: NodeTool@0
+      displayName: 'Use Node 10.x'
+      inputs:
+        versionSpec: 10.x
+
+    - bash: |
+        set -ex
+
+        # clean install
+        npm ci
+        npm run release-ci
+
+        OS=${{ parameters.os }}
+        ARTIFACT_NAME=${{ parameters.artifact }}
+
+        mkdir -p ${OS}
+        cp releases/${ARTIFACT_NAME} ${OS}/
+
+      displayName: Build
+
+    - publish: $(System.DefaultWorkingDirectory)/${{ parameters.os }}
+      artifact: ${{ parameters.os }}

azure-pipelines/templates/create-github-release.yml

@@ -0,0 +1,32 @@
+  parameters:
+    GitHubConnection: '' # defaults for any parameters that aren't specified
+    repositoryName: ''
+    releaseNotesSource: input
+    addChangeLog: false
+    isPreRelease: true
+    isDraft: true
+
+  jobs:
+  - job: Create_Github_Release
+    timeoutInMinutes: 30 # timeout on job if deploy is not completed in 30 minutes
+    pool:
+      vmImage: ubuntu-16.04
+    steps:
+    - checkout: none # we already have the artifacts built, don't need the code
+
+    - download: current
+
+    - task: GitHubRelease@0
+      displayName: 'GitHub release (create)'
+      inputs:
+        gitHubConnection: ${{ parameters.GitHubConnection }}
+        repositoryName: ${{ parameters.repositoryName }}
+        releaseNotesSource: ${{ parameters.releaseNotesSource }}
+        target: $(Build.SourceBranch)
+        assets: |
+          ../linux/*
+          ../windows/*
+          ../mac/*
+        addChangeLog: ${{ parameters.addChangeLog }}
+        isDraft: true # for testing, change to true when ready to merge
+        isPreRelease: ${{ parameters.isPrelease }}

package.json

@@ -23,6 +23,7 @@
         "buffer-reverse": "^1.0.1",
         "crypto-js": "^3.1.9-1",
         "dotenv": "^7.0.0",
+        "express-request-id": "^1.4.1",
         "google-protobuf": "^3.6.1",
         "jpeg-js": "^0.3.4",
         "json2csv": "^4.5.0",