diff --git a/azure-pipelines/linux/artifact-build-linux.yml b/azure-pipelines/linux/artifact-build-linux.yml index e6bbf53..26cdf1e 100644 --- a/azure-pipelines/linux/artifact-build-linux.yml +++ b/azure-pipelines/linux/artifact-build-linux.yml @@ -8,13 +8,13 @@ steps: inputs: versionSpec: 10.x - - bash: | + - bash: | set -ex - + # clean install npm ci - npm run release - + npm run release-ci + mkdir -p linux cp releases/vott*.snap linux/ displayName: Build diff --git a/azure-pipelines/mac/artifact-build-mac.yml b/azure-pipelines/mac/artifact-build-mac.yml index bbe7225..24c74a9 100644 --- a/azure-pipelines/mac/artifact-build-mac.yml +++ b/azure-pipelines/mac/artifact-build-mac.yml @@ -4,13 +4,13 @@ steps: inputs: versionSpec: 10.x - - bash: | + - bash: | set -ex - + # clean install npm ci - npm run release - + npm run release-ci + mkdir -p mac cp releases/vott*.dmg mac/ displayName: Build diff --git a/azure-pipelines/windows/artifact-build-windows.yml b/azure-pipelines/windows/artifact-build-windows.yml index 875fa9f..0e39f4c 100644 --- a/azure-pipelines/windows/artifact-build-windows.yml +++ b/azure-pipelines/windows/artifact-build-windows.yml @@ -4,16 +4,16 @@ steps: inputs: versionSpec: 10.x - - bash: | + - bash: | set -ex - + # clean install npm ci - npm run release - + npm run release-ci + mkdir -p windows cp releases/vott*.exe windows/ - + displayName: Build - task: PublishBuildArtifacts@1 diff --git a/package-lock.json b/package-lock.json index f4ee49f..77c4644 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7232,8 +7232,7 @@ }, "ansi-regex": { "version": "2.1.1", - "bundled": true, - "optional": true + "bundled": true }, "aproba": { "version": "1.2.0", @@ -7251,13 +7250,11 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true, - "optional": true + "bundled": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -7270,18 +7267,15 @@ }, "code-point-at": { "version": "1.1.0", - "bundled": true, - "optional": true + "bundled": true }, "concat-map": { "version": "0.0.1", - "bundled": true, - "optional": true + "bundled": true }, "console-control-strings": { "version": "1.1.0", - "bundled": true, - "optional": true + "bundled": true }, "core-util-is": { "version": "1.0.2", @@ -7384,8 +7378,7 @@ }, "inherits": { "version": "2.0.3", - "bundled": true, - "optional": true + "bundled": true }, "ini": { "version": "1.3.5", @@ -7395,7 +7388,6 @@ "is-fullwidth-code-point": { "version": "1.0.0", "bundled": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -7408,20 +7400,17 @@ "minimatch": { "version": "3.0.4", "bundled": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } }, "minimist": { "version": "0.0.8", - "bundled": true, - "optional": true + "bundled": true }, "minipass": { "version": "2.2.4", "bundled": true, - "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -7438,7 +7427,6 @@ "mkdirp": { "version": "0.5.1", "bundled": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -7511,8 +7499,7 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true, - "optional": true + "bundled": true }, "object-assign": { "version": "4.1.1", @@ -7522,7 +7509,6 @@ "once": { "version": "1.4.0", "bundled": true, - "optional": true, "requires": { "wrappy": "1" } @@ -7598,8 +7584,7 @@ }, "safe-buffer": { "version": "5.1.1", - "bundled": true, - "optional": true + "bundled": true }, "safer-buffer": { "version": "2.1.2", @@ -7629,7 +7614,6 @@ "string-width": { "version": "1.0.2", "bundled": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -7647,7 +7631,6 @@ "strip-ansi": { "version": "3.0.1", "bundled": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -7686,13 +7669,11 @@ }, "wrappy": { "version": "1.0.2", - "bundled": true, - "optional": true + "bundled": true }, "yallist": { "version": "3.0.2", - "bundled": true, - "optional": true + "bundled": true } } }, diff --git a/package.json b/package.json index 11c9f1b..d4ac763 100644 --- a/package.json +++ b/package.json @@ -65,6 +65,7 @@ "eject": "react-scripts eject", "release-pr": "./scripts/release-pr.sh", "release-web": "npm run build && npm run webpack:prod", + "release-ci": "./scripts/build.sh", "release": "npm run build && npm run webpack:prod && electron-builder", "pretest": "./node_modules/.bin/tslint 'src/**/*.ts*'", "lintfix": "./node_modules/.bin/tslint 'src/**/*.ts*' --fix", diff --git a/public/index.html b/public/index.html index 24c5013..4ba4dab 100644 --- a/public/index.html +++ b/public/index.html @@ -19,14 +19,14 @@ work correctly both with client-side routing and a non-root public URL. Learn how to configure a non-root public URL by running `npm run build`. --> - Visual Object Tagging Tool (VoTT) + Visual Object Tagging Tool (VoTT) v%REACT_APP_VERSION%
-
VoTT v%REACT_APP_VERSION%, commit=%REACT_APP_COMMIT_SHA%
+
VoTT v%REACT_APP_VERSION%, commit=%REACT_APP_COMMIT_SHA%