From 3ce916b306ad34a4f3cb51ff4754e92230092f9f Mon Sep 17 00:00:00 2001 From: Sergey Shandar Date: Tue, 9 Apr 2019 10:31:24 -0700 Subject: [PATCH] Update Avocado to use new diff logic. (#5566) * Avocado from GitHub * new pipeline * remove avocado.ts * DO NOT MERGE * Update package.json * Revert "DO NOT MERGE" This reverts commit 25853152f309c51e0c7453bcd3c868cf65d34cd3. --- azure-pipelines.yml | 2 +- package.json | 2 +- scripts/avocado.ts | 44 -------------------------------------------- 3 files changed, 2 insertions(+), 46 deletions(-) delete mode 100644 scripts/avocado.ts diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 67452aab2c97..003bf46bbc9e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -64,7 +64,7 @@ jobs: displayName: 'npm install' inputs: verbose: false - - script: './node_modules/.bin/ts-node scripts/avocado.ts' + - script: './node_modules/.bin/avocado' displayName: 'Avocado' - job: "BreakingChange" diff --git a/package.json b/package.json index e7a8bcea092e..264465a762ea 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "description": "Tests for Azure REST API Specifications", "license": "MIT", "devDependencies": { - "@azure/avocado": "^0.2.2", + "@azure/avocado": "^0.3.0", "@azure/oad": "^0.4.3", "@microsoft.azure/async-io": "^1.0.21", "@microsoft.azure/literate": "^1.0.21", diff --git a/scripts/avocado.ts b/scripts/avocado.ts deleted file mode 100644 index f0664c71dfb0..000000000000 --- a/scripts/avocado.ts +++ /dev/null @@ -1,44 +0,0 @@ -const utils = require('../test/util/utils') -import * as path from "path" -import * as avocado from "@azure/avocado" -import * as openApiMarkDown from "@azure/openapi-markdown" -import * as yaml from "js-yaml" - -async function main() { - const swaggersToProcess = utils.getFilesChangedInPR(); - let errorNumbers = 0 - const set = new Set() - for (const swagger of swaggersToProcess) { - const rm = await openApiMarkDown.findReadMe(path.dirname(swagger)) - if (rm === undefined) { - console.error(`No readme.md for ${swagger}`) - ++errorNumbers - } else { - const dir = path.dirname(rm) - if (dir.includes("specification")) { - set.add(dir) - } else { - console.error(`No readme.md for ${swagger}`) - ++errorNumbers - } - } - } - for (const swagger of set) { - try { - console.log(swagger) - const errors = avocado.avocado(swagger) - for await (const e of errors) { - console.error(yaml.safeDump(e)) - ++errorNumbers - } - } catch (e) { - console.error("fatal error:") - console.error(e) - ++errorNumbers - } - } - console.log(`errors: ${errorNumbers}`) - return errorNumbers === 0 ? 0 : 1 -} - -main().then(process.exit) \ No newline at end of file