Skip to content
This repository was archived by the owner on Dec 7, 2021. It is now read-only.

Commit 94f0990

Browse files
mydiemhomydiemho
committed
Merge branch 'develop'
2 parents c1afb7e + 347f609 commit 94f0990

49 files changed

Lines changed: 10886 additions & 85 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.dependabot/config.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
version: 1
2+
3+
update_configs:
4+
target_branch: "develop"
5+
6+
# Keep package.json (& lockfiles) up to date weekly
7+
- package_manager: "javascript"
8+
directory: "/"
9+
update_schedule: "weekly"
10+
11+
default_labels:
12+
- "dependencies"
13+
- "dependabot"

‎.gitignore‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
# misc
2121
.DS_Store
22+
.env
2223
.env.local
2324
.env.development.local
2425
.env.test.local
@@ -37,3 +38,8 @@ secrets.sh
3738
# complexity reports
3839
es6-src/
3940
report/
41+
42+
# VoTT Server
43+
server/lib
44+
server/node_modules
45+
server/coverage

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ VoTT helps facilitate an end-to-end machine learning pipeline:
2828

2929
<!-- toc -->
3030

31+
3132
- [VoTT (Visual Object Tagging Tool)](#vott-visual-object-tagging-tool)
3233
- [Table of Contents](#table-of-contents)
3334
- [Getting Started](#getting-started)

‎azure-pipelines.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
- job: MacOS
1919
pool:
20-
vmImage: macOS-10.13
20+
vmImage: macOS-10.15
2121
timeoutInMinutes: 60 # how long to run the job before automatically cancelling
2222
steps:
2323
- checkout: self # self represents the repo where the initial Pipelines YAML file was found
@@ -26,7 +26,7 @@ jobs:
2626

2727
- job: Windows
2828
pool:
29-
vmImage: win1803
29+
vmImage: "windows-2019"
3030
timeoutInMinutes: 60 # how long to run the job before automatically cancelling
3131
steps:
3232
- checkout: self # self represents the repo where the initial Pipelines YAML file was found

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ steps:
5151
- task: AzureCLI@1
5252
displayName: "Pull down old report and add updates"
5353
inputs:
54-
azureSubscription: 'PELITTLE TEAM - CSE DWR (d36d0808-a967-4f73-9fdc-32ea232fc81d)'
54+
azureSubscription: 'pj-little-sub'
5555
scriptLocation: inlineScript
5656
inlineScript: './scripts/update-report.sh'
5757

‎azure-pipelines/templates/build-artifact.yml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# https://docs.microsoft.com/en-us/azure/devops/pipelines/process/templates?view=azure-devops#job-templates-with-parameters
2+
jobs:
3+
- job: ${{ parameters.name }}
4+
pool: ${{ parameters.pool }}
5+
timeoutInMinutes: 15 # how long to run the job before automatically cancelling
6+
steps:
7+
- task: NodeTool@0
8+
displayName: 'Use Node 10.x'
9+
inputs:
10+
versionSpec: 10.x
11+
12+
- bash: |
13+
set -ex
14+
15+
# clean install
16+
npm ci
17+
npm run release-ci
18+
19+
OS=${{ parameters.os }}
20+
ARTIFACT_NAME=${{ parameters.artifact }}
21+
22+
mkdir -p ${OS}
23+
cp releases/${ARTIFACT_NAME} ${OS}/
24+
25+
displayName: Build
26+
27+
- publish: $(System.DefaultWorkingDirectory)/${{ parameters.os }}
28+
artifact: ${{ parameters.os }}

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

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
parameters:
2+
GitHubConnection: '' # defaults for any parameters that aren't specified
3+
repositoryName: ''
4+
releaseNotesSource: input
5+
addChangeLog: false
6+
isPreRelease: true
7+
isDraft: true
8+
9+
jobs:
10+
- job: Create_Github_Release
11+
timeoutInMinutes: 30 # timeout on job if deploy is not completed in 30 minutes
12+
pool:
13+
vmImage: ubuntu-16.04
14+
steps:
15+
- checkout: none # we already have the artifacts built, don't need the code
16+
17+
- download: current
18+
19+
- task: GitHubRelease@0
20+
displayName: 'GitHub release (create)'
21+
inputs:
22+
gitHubConnection: ${{ parameters.GitHubConnection }}
23+
repositoryName: ${{ parameters.repositoryName }}
24+
releaseNotesSource: ${{ parameters.releaseNotesSource }}
25+
target: $(Build.SourceBranch)
26+
assets: |
27+
../linux/*
28+
../windows/*
29+
../mac/*
30+
addChangeLog: ${{ parameters.addChangeLog }}
31+
isDraft: true # for testing, change to true when ready to merge
32+
isPreRelease: ${{ parameters.isPrelease }}

‎package-lock.json‎

Lines changed: 20 additions & 31 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
"buffer-reverse": "^1.0.1",
2424
"crypto-js": "^3.1.9-1",
2525
"dotenv": "^7.0.0",
26+
"express-request-id": "^1.4.1",
2627
"google-protobuf": "^3.6.1",
2728
"jpeg-js": "^0.3.4",
2829
"json2csv": "^4.5.0",

0 commit comments

Comments
 (0)