From 44a55f3c77695c6641fe1c6f2ded1b179cfccc60 Mon Sep 17 00:00:00 2001 From: Konstantin Tyukalov Date: Fri, 29 Jul 2022 12:31:19 +0400 Subject: [PATCH 1/5] Remove npm package definition from tests --- .../JenkinsQueueJobV2/Tests/package-lock.json | 90 ------------------- Tasks/JenkinsQueueJobV2/Tests/package.json | 18 ---- 2 files changed, 108 deletions(-) delete mode 100644 Tasks/JenkinsQueueJobV2/Tests/package-lock.json delete mode 100644 Tasks/JenkinsQueueJobV2/Tests/package.json diff --git a/Tasks/JenkinsQueueJobV2/Tests/package-lock.json b/Tasks/JenkinsQueueJobV2/Tests/package-lock.json deleted file mode 100644 index 9f2b7565b689..000000000000 --- a/Tasks/JenkinsQueueJobV2/Tests/package-lock.json +++ /dev/null @@ -1,90 +0,0 @@ -{ - "name": "vsts-tasks-jenkinsqueuejob", - "requires": true, - "lockfileVersion": 1, - "dependencies": { - "@types/mocha": { - "version": "5.2.5", - "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-5.2.5.tgz", - "integrity": "sha512-lAVp+Kj54ui/vLUFxsJTMtWvZraZxum3w3Nwkble2dNuV5VnPA+Mi2oGX9XYJAaIvZi3tn3cbjS/qcJXRb6Bww==", - "dev": true - }, - "azure-pipelines-task-lib": { - "version": "2.9.3", - "resolved": "https://registry.npmjs.org/azure-pipelines-task-lib/-/azure-pipelines-task-lib-2.9.3.tgz", - "integrity": "sha512-SPWKSfgmjyBDVIMzXnnPH0Gv7YXZ+AQ3SyIhNNALAmQpOltqJhgslvzrOClR5rKuoOyJlG0AWZILbZIXCkztAA==", - "dev": true, - "requires": { - "minimatch": "3.0.4", - "mockery": "^1.7.0", - "q": "^1.1.2", - "semver": "^5.1.0", - "shelljs": "^0.3.0", - "uuid": "^3.0.1" - }, - "dependencies": { - "uuid": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", - "dev": true - } - } - }, - "balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true - }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true - }, - "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "mockery": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/mockery/-/mockery-1.7.0.tgz", - "integrity": "sha1-9O3g2HUMHJcnwnLqLGBiniyaHE8=", - "dev": true - }, - "q": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", - "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=", - "dev": true - }, - "semver": { - "version": "5.5.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.1.tgz", - "integrity": "sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==", - "dev": true - }, - "shelljs": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz", - "integrity": "sha1-NZbmMHp4FUT1kfN9phg2DzHbV7E=", - "dev": true - } - } -} diff --git a/Tasks/JenkinsQueueJobV2/Tests/package.json b/Tasks/JenkinsQueueJobV2/Tests/package.json deleted file mode 100644 index 54189539e821..000000000000 --- a/Tasks/JenkinsQueueJobV2/Tests/package.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "vsts-tasks-jenkinsqueuejob", - "devDependencies": { - "@types/mocha": "^5.2.0", - "azure-pipelines-task-lib": "2.9.3" - }, - "description": "Azure Pipelines Jenkins Queue Job Task", - "repository": { - "type": "git", - "url": "git+https://github.com/Microsoft/azure-pipelines-tasks.git" - }, - "author": "Microsoft Corporation", - "license": "MIT", - "bugs": { - "url": "https://github.com/Microsoft/azure-pipelines-tasks/issues" - }, - "homepage": "https://github.com/Microsoft/azure-pipelines-tasks#readme" -} From a041df666b1d25a24fcd4fd4e665a43894a1d9fe Mon Sep 17 00:00:00 2001 From: Konstantin Tyukalov Date: Fri, 29 Jul 2022 12:32:18 +0400 Subject: [PATCH 2/5] Remove unused imports in tests --- Tasks/JenkinsQueueJobV2/Tests/L0.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/Tasks/JenkinsQueueJobV2/Tests/L0.ts b/Tasks/JenkinsQueueJobV2/Tests/L0.ts index 6a025c7b0822..25af05eea143 100644 --- a/Tasks/JenkinsQueueJobV2/Tests/L0.ts +++ b/Tasks/JenkinsQueueJobV2/Tests/L0.ts @@ -3,9 +3,7 @@ import assert = require('assert'); import path = require('path'); -import os = require('os'); import process = require('process'); -import fs = require('fs'); import {JobState, checkStateTransitions} from '../states'; import * as ttm from 'azure-pipelines-task-lib/mock-test'; From 9495cc3dfab61238ca07f3a0d4df623278b3dd64 Mon Sep 17 00:00:00 2001 From: Konstantin Tyukalov Date: Fri, 29 Jul 2022 12:32:43 +0400 Subject: [PATCH 3/5] Add scripts for build and test task --- Tasks/JenkinsQueueJobV2/package.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Tasks/JenkinsQueueJobV2/package.json b/Tasks/JenkinsQueueJobV2/package.json index e21b949b5d9a..65e7da93cf94 100644 --- a/Tasks/JenkinsQueueJobV2/package.json +++ b/Tasks/JenkinsQueueJobV2/package.json @@ -10,6 +10,10 @@ "bugs": { "url": "https://github.com/Microsoft/azure-pipelines-tasks/issues" }, + "scripts": { + "build": "node ../../make.js build --task JenkinsQueueJobV2", + "test": "node ../../make.js test --task JenkinsQueueJobV2" + }, "homepage": "https://github.com/Microsoft/azure-pipelines-tasks#readme", "dependencies": { "@types/node": "^10.17.0", From 11978dc2eb78bd9e0c9c3ab49d1820f2def26d1b Mon Sep 17 00:00:00 2001 From: Konstantin Tyukalov Date: Fri, 29 Jul 2022 12:44:50 +0400 Subject: [PATCH 4/5] Npm audit fix --- Tasks/JenkinsQueueJobV2/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Tasks/JenkinsQueueJobV2/package-lock.json b/Tasks/JenkinsQueueJobV2/package-lock.json index 5a11bda33cdc..412a582e29dc 100644 --- a/Tasks/JenkinsQueueJobV2/package-lock.json +++ b/Tasks/JenkinsQueueJobV2/package-lock.json @@ -433,9 +433,9 @@ "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" }, "path-parse": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", - "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==" + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" }, "performance-now": { "version": "2.1.0", From 6b825a002bbe3fcedafbd222458b32077692a8f2 Mon Sep 17 00:00:00 2001 From: Konstantin Tyukalov Date: Fri, 29 Jul 2022 12:48:20 +0400 Subject: [PATCH 5/5] Bump task version to 2.209.0 --- Tasks/JenkinsQueueJobV2/task.json | 2 +- Tasks/JenkinsQueueJobV2/task.loc.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Tasks/JenkinsQueueJobV2/task.json b/Tasks/JenkinsQueueJobV2/task.json index 69148a3274ee..0cf7100a1362 100644 --- a/Tasks/JenkinsQueueJobV2/task.json +++ b/Tasks/JenkinsQueueJobV2/task.json @@ -14,7 +14,7 @@ "demands": [], "version": { "Major": 2, - "Minor": 200, + "Minor": 209, "Patch": 0 }, "groups": [ diff --git a/Tasks/JenkinsQueueJobV2/task.loc.json b/Tasks/JenkinsQueueJobV2/task.loc.json index 554c1f2c0a2c..38bdd298641c 100644 --- a/Tasks/JenkinsQueueJobV2/task.loc.json +++ b/Tasks/JenkinsQueueJobV2/task.loc.json @@ -14,7 +14,7 @@ "demands": [], "version": { "Major": 2, - "Minor": 200, + "Minor": 209, "Patch": 0 }, "groups": [