From d7c7593c0d0b6aabe5a5f2654e85ec3fe4461041 Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Wed, 4 Nov 2020 05:49:37 -0500 Subject: [PATCH] Add CI step to run future extension tests (#1214) Signed-off-by: Sebastian Malton --- .azure-pipelines.yml | 6 ++++++ Makefile | 15 ++++++++++----- build/set_npm_version.ts | 2 +- extensions/example-extension/Makefile | 7 +++++-- extensions/example-extension/package.json | 3 ++- extensions/license-menu-item/Makefile | 7 +++++-- extensions/license-menu-item/package.json | 3 ++- extensions/metrics-cluster-feature/Makefile | 7 +++++-- extensions/metrics-cluster-feature/package.json | 3 ++- extensions/node-menu/Makefile | 7 +++++-- extensions/node-menu/package.json | 3 ++- extensions/pod-menu/Makefile | 7 +++++-- extensions/pod-menu/package.json | 3 ++- extensions/support-page/Makefile | 7 +++++-- extensions/support-page/package.json | 3 ++- extensions/telemetry/Makefile | 7 +++++-- extensions/telemetry/package-lock.json | 12 ++++++------ extensions/telemetry/package.json | 3 ++- 18 files changed, 72 insertions(+), 33 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 56e5fbe57e..f6060ca1dd 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -39,6 +39,8 @@ jobs: displayName: Install dependencies - script: make integration-win displayName: Run integration tests + - script: make test-extensions + displayName: Run In-tree Extension tests - script: make build condition: "and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/'))" displayName: Build @@ -78,6 +80,8 @@ jobs: displayName: Run tests - script: make integration-mac displayName: Run integration tests + - script: make test-extensions + displayName: Run In-tree Extension tests - script: make build condition: "and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/'))" displayName: Build @@ -119,6 +123,8 @@ jobs: condition: eq(variables.CACHE_RESTORED, 'true') - script: make install-deps displayName: Install dependencies + - script: make test-extensions + displayName: Run In-tree Extension tests - script: make lint displayName: Lint - script: make test diff --git a/Makefile b/Makefile index 514e64ae49..434e1dd6e1 100644 --- a/Makefile +++ b/Makefile @@ -33,15 +33,15 @@ lint: test: download-bins yarn test -integration-linux: +integration-linux: build-extension-types build-extensions yarn build:linux yarn integration -integration-mac: +integration-mac: build-extension-types build-extensions yarn build:mac yarn integration -integration-win: +integration-win: build-extension-types build-extensions yarn build:win yarn integration @@ -58,10 +58,15 @@ endif build-extensions: $(foreach dir, $(wildcard $(EXTENSIONS_DIR)/*), $(MAKE) -C $(dir) build;) -build-npm: - yarn compile:extension-types +test-extensions: + $(foreach dir, $(wildcard $(EXTENSIONS_DIR)/*), $(MAKE) -C $(dir) test;) + +build-npm: build-extension-types yarn npm:fix-package-version +build-extension-types: + yarn compile:extension-types + publish-npm: build-npm npm config set '//registry.npmjs.org/:_authToken' "${NPM_TOKEN}" cd src/extensions/npm/extensions && npm publish --access=public diff --git a/build/set_npm_version.ts b/build/set_npm_version.ts index 34a11da6c9..70ce97416d 100644 --- a/build/set_npm_version.ts +++ b/build/set_npm_version.ts @@ -6,4 +6,4 @@ import appInfo from "../package.json" const packagePath = path.join(__dirname, "../src/extensions/npm/extensions/package.json") packageInfo.version = appInfo.version -fs.writeFileSync(packagePath, JSON.stringify(packageInfo, null, 2)) +fs.writeFileSync(packagePath, JSON.stringify(packageInfo, null, 2) + "\n") diff --git a/extensions/example-extension/Makefile b/extensions/example-extension/Makefile index d73e8524cb..10cb709d20 100644 --- a/extensions/example-extension/Makefile +++ b/extensions/example-extension/Makefile @@ -1,5 +1,8 @@ install-deps: - npm install + yarn install build: install-deps - npm run build + yarn run build + +test: + yarn run test diff --git a/extensions/example-extension/package.json b/extensions/example-extension/package.json index a91b332f38..44f9940d91 100644 --- a/extensions/example-extension/package.json +++ b/extensions/example-extension/package.json @@ -10,7 +10,8 @@ }, "scripts": { "build": "webpack --config webpack.config.js", - "dev": "npm run build --watch" + "dev": "npm run build --watch", + "test": "echo NO TESTS" }, "dependencies": { "react-open-doodles": "^1.0.5" diff --git a/extensions/license-menu-item/Makefile b/extensions/license-menu-item/Makefile index d73e8524cb..10cb709d20 100644 --- a/extensions/license-menu-item/Makefile +++ b/extensions/license-menu-item/Makefile @@ -1,5 +1,8 @@ install-deps: - npm install + yarn install build: install-deps - npm run build + yarn run build + +test: + yarn run test diff --git a/extensions/license-menu-item/package.json b/extensions/license-menu-item/package.json index ee766cc9a1..ebc036ad7c 100644 --- a/extensions/license-menu-item/package.json +++ b/extensions/license-menu-item/package.json @@ -5,7 +5,8 @@ "main": "dist/main.js", "scripts": { "build": "webpack -p", - "dev": "webpack --watch" + "dev": "webpack --watch", + "test": "echo NO TESTS" }, "dependencies": {}, "devDependencies": { diff --git a/extensions/metrics-cluster-feature/Makefile b/extensions/metrics-cluster-feature/Makefile index d73e8524cb..10cb709d20 100644 --- a/extensions/metrics-cluster-feature/Makefile +++ b/extensions/metrics-cluster-feature/Makefile @@ -1,5 +1,8 @@ install-deps: - npm install + yarn install build: install-deps - npm run build + yarn run build + +test: + yarn run test diff --git a/extensions/metrics-cluster-feature/package.json b/extensions/metrics-cluster-feature/package.json index 0843156f0a..147deec783 100644 --- a/extensions/metrics-cluster-feature/package.json +++ b/extensions/metrics-cluster-feature/package.json @@ -9,7 +9,8 @@ }, "scripts": { "build": "webpack --config webpack.config.js", - "dev": "npm run build --watch" + "dev": "npm run build --watch", + "test": "echo NO TESTS" }, "dependencies": { "semver": "^7.3.2" diff --git a/extensions/node-menu/Makefile b/extensions/node-menu/Makefile index d73e8524cb..10cb709d20 100644 --- a/extensions/node-menu/Makefile +++ b/extensions/node-menu/Makefile @@ -1,5 +1,8 @@ install-deps: - npm install + yarn install build: install-deps - npm run build + yarn run build + +test: + yarn run test diff --git a/extensions/node-menu/package.json b/extensions/node-menu/package.json index c183316a78..b78fe185be 100644 --- a/extensions/node-menu/package.json +++ b/extensions/node-menu/package.json @@ -9,7 +9,8 @@ }, "scripts": { "build": "webpack --config webpack.config.js", - "dev": "npm run build --watch" + "dev": "npm run build --watch", + "test": "echo NO TESTS" }, "dependencies": {}, "devDependencies": { diff --git a/extensions/pod-menu/Makefile b/extensions/pod-menu/Makefile index d73e8524cb..10cb709d20 100644 --- a/extensions/pod-menu/Makefile +++ b/extensions/pod-menu/Makefile @@ -1,5 +1,8 @@ install-deps: - npm install + yarn install build: install-deps - npm run build + yarn run build + +test: + yarn run test diff --git a/extensions/pod-menu/package.json b/extensions/pod-menu/package.json index 21b4f3d65b..48fa397c96 100644 --- a/extensions/pod-menu/package.json +++ b/extensions/pod-menu/package.json @@ -9,7 +9,8 @@ }, "scripts": { "build": "webpack --config webpack.config.js", - "dev": "npm run build --watch" + "dev": "npm run build --watch", + "test": "echo NO TESTS" }, "dependencies": {}, "devDependencies": { diff --git a/extensions/support-page/Makefile b/extensions/support-page/Makefile index d73e8524cb..10cb709d20 100644 --- a/extensions/support-page/Makefile +++ b/extensions/support-page/Makefile @@ -1,5 +1,8 @@ install-deps: - npm install + yarn install build: install-deps - npm run build + yarn run build + +test: + yarn run test diff --git a/extensions/support-page/package.json b/extensions/support-page/package.json index a556eeb37b..fd98150423 100644 --- a/extensions/support-page/package.json +++ b/extensions/support-page/package.json @@ -6,7 +6,8 @@ "renderer": "dist/renderer.js", "scripts": { "build": "webpack -p", - "dev": "webpack --watch" + "dev": "webpack --watch", + "test": "echo NO TESTS" }, "dependencies": {}, "devDependencies": { diff --git a/extensions/telemetry/Makefile b/extensions/telemetry/Makefile index d73e8524cb..10cb709d20 100644 --- a/extensions/telemetry/Makefile +++ b/extensions/telemetry/Makefile @@ -1,5 +1,8 @@ install-deps: - npm install + yarn install build: install-deps - npm run build + yarn run build + +test: + yarn run test diff --git a/extensions/telemetry/package-lock.json b/extensions/telemetry/package-lock.json index bff56fc715..bf5717ac5e 100644 --- a/extensions/telemetry/package-lock.json +++ b/extensions/telemetry/package-lock.json @@ -8,12 +8,6 @@ "version": "file:../../src/extensions/npm/extensions", "dev": true }, - "@types/analytics-node": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/@types/analytics-node/-/analytics-node-3.1.3.tgz", - "integrity": "sha512-Yk299LUqnyJ6fNYQkLFd0yTfUwIvgfxH3f5WEX3ib0PC5T+mZgqcOPMDhNZ4AOD/A9tXKJQeBIb6KvgzuXflaQ==", - "dev": true - }, "@segment/loosely-validate-event": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@segment/loosely-validate-event/-/loosely-validate-event-2.0.0.tgz", @@ -24,6 +18,12 @@ "join-component": "^1.1.0" } }, + "@types/analytics-node": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/@types/analytics-node/-/analytics-node-3.1.3.tgz", + "integrity": "sha512-Yk299LUqnyJ6fNYQkLFd0yTfUwIvgfxH3f5WEX3ib0PC5T+mZgqcOPMDhNZ4AOD/A9tXKJQeBIb6KvgzuXflaQ==", + "dev": true + }, "@webassemblyjs/ast": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz", diff --git a/extensions/telemetry/package.json b/extensions/telemetry/package.json index cfb2bd6fa3..2b7c1f83de 100644 --- a/extensions/telemetry/package.json +++ b/extensions/telemetry/package.json @@ -10,7 +10,8 @@ }, "scripts": { "build": "webpack -p", - "dev": "webpack --watch" + "dev": "webpack --watch", + "test": "echo NO TESTS" }, "dependencies": {}, "devDependencies": {