From 588f485d4d0f71887d3e4c7a630d3e3519752b9c Mon Sep 17 00:00:00 2001 From: Juan Munoz Date: Wed, 1 May 2024 14:40:40 +0200 Subject: [PATCH 1/3] chore: add dependency in nx (test depends on build) Signed-off-by: Juan Munoz --- nx.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nx.json b/nx.json index d180b5d05c..7d544f8101 100644 --- a/nx.json +++ b/nx.json @@ -17,7 +17,7 @@ }, "test": { "inputs": ["default", "^default"], - "dependsOn": ["^test"] + "dependsOn": ["^test", "build"] }, "build": { "dependsOn": ["clean", "^clean", "^build"] From 91325ea86242c1e4963a1590b43fe64638f88dc0 Mon Sep 17 00:00:00 2001 From: Juan Munoz Date: Wed, 1 May 2024 14:44:52 +0200 Subject: [PATCH 2/3] chore: update build scripts to avoid unnecessary call to test script Signed-off-by: Juan Munoz --- packages/open-scd/package.json | 3 +-- packages/plugins/package.json | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/open-scd/package.json b/packages/open-scd/package.json index 2cee085e23..3ff742af96 100644 --- a/packages/open-scd/package.json +++ b/packages/open-scd/package.json @@ -68,8 +68,7 @@ "release:minor": "standard-version --release-as minor", "release:patch": "standard-version --release-as patch", "release:major": "standard-version --release-as major", - "build": "npm run test && npm run build:notest && cp .nojekyll build/", - "build:notest": "npm run doc && snowpack build && workbox generateSW workbox-config.cjs", + "build": "npm run doc && snowpack build && workbox generateSW workbox-config.cjs && cp .nojekyll build/", "start": "snowpack dev" }, "devDependencies": { diff --git a/packages/plugins/package.json b/packages/plugins/package.json index 2df31c47ed..d6b0826457 100644 --- a/packages/plugins/package.json +++ b/packages/plugins/package.json @@ -60,8 +60,7 @@ "release:minor": "standard-version --release-as minor", "release:patch": "standard-version --release-as patch", "release:major": "standard-version --release-as major", - "build": "npm run test && npm run build:notest", - "build:notest": "npm run doc && npm run bundle", + "build": "npm run doc && npm run bundle", "bundle": "tsc" }, "devDependencies": { From 9cde6b09ee04b23363159066c79e985ab579d3b3 Mon Sep 17 00:00:00 2001 From: Juan Munoz Date: Wed, 1 May 2024 14:47:01 +0200 Subject: [PATCH 3/3] ci: updated scripts and wildcards in test workflows Signed-off-by: Juan Munoz --- .github/workflows/test-and-build.yml | 4 ++-- .github/workflows/test.yml | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-and-build.yml b/.github/workflows/test-and-build.yml index 3404f4ede3..5690f88f0f 100644 --- a/.github/workflows/test-and-build.yml +++ b/.github/workflows/test-and-build.yml @@ -13,7 +13,7 @@ jobs: with: node-version: "18.x" - - name: Install and Build OpenSCD + - name: Install and Test OpenSCD run: | npm clean-install - npm run-script build + npm run-script test diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index be2e724293..ad3c5f4282 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -4,8 +4,7 @@ on: branches-ignore: - main paths: - - packages/open-scd/** - - packages/plugins/** + - packages/** jobs: test: