From aac342dd9d7ec8a365354fbe2834744b57cf027e Mon Sep 17 00:00:00 2001 From: toasted-nutbread Date: Sun, 10 Dec 2023 10:18:51 -0500 Subject: [PATCH 1/4] Add typescript checks to CI --- package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index b908e2f6a3..3f11a03746 100644 --- a/package.json +++ b/package.json @@ -9,11 +9,12 @@ "scripts": { "build": "node ./dev/bin/build.js", "build-libs": "node ./dev/bin/build-libs.js", - "test": "npm run test-lint-js && npm run test-ts && npm run test-ts-dev && npm run test-ts-test && npm run test-lint-css && npm run test-lint-html && npm run test-code && npm run test-build", + "test": "npm run test-lint-js && npm run test-ts && npm run test-lint-css && npm run test-lint-html && npm run test-code && npm run test-build", "test-lint-js": "npx eslint .", "test-lint-css": "npx stylelint \"ext/**/*.css\" \"test/**/*.css\" \"dev/**/*.css\"", "test-lint-html": "npx html-validate \"ext/**/*.html\" \"test/**/*.html\" \"dev/**/*.html\"", - "test-ts": "npx tsc --noEmit --project jsconfig.json", + "test-ts": "npm run test-ts-main && npm run test-ts-dev && npm run test-ts-test", + "test-ts-main": "npx tsc --noEmit --project jsconfig.json", "test-ts-dev": "npx tsc --noEmit --project dev/jsconfig.json", "test-ts-test": "npx tsc --noEmit --project test/jsconfig.json", "test-code": "vitest run", From fd9563e403c059d1d1639a0b9d6b4c5795a13542 Mon Sep 17 00:00:00 2001 From: toasted-nutbread Date: Sun, 10 Dec 2023 10:27:17 -0500 Subject: [PATCH 2/4] Actually save the CI file --- .github/workflows/ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 65d5efb01d..e395bbefd4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,6 +30,11 @@ jobs: env: CI: true + - name: Validate JS Types + run: npm run test-ts + env: + CI: true + - name: Lint CSS run: npm run test-lint-css env: From ebf36495077172a36dbe14793157ef39c8831a65 Mon Sep 17 00:00:00 2001 From: toasted-nutbread Date: Sun, 10 Dec 2023 10:39:32 -0500 Subject: [PATCH 3/4] Run build-libs before test-ts --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e395bbefd4..684d533644 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,9 @@ jobs: CI: true - name: Validate JS Types - run: npm run test-ts + run: | + npm run build-libs + npm run test-ts env: CI: true From 49ebea74c69d4cf7f5308d2a1e75a955a4a66d5f Mon Sep 17 00:00:00 2001 From: toasted-nutbread Date: Sun, 10 Dec 2023 23:14:58 -0500 Subject: [PATCH 4/4] Move build libs CI --- .github/workflows/ci.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 684d533644..14e909f079 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,15 +25,16 @@ jobs: - name: Install dependencies run: npm ci + - name: Build Libs + run: npm run build-libs + - name: Lint JS run: npm run test-lint-js env: CI: true - name: Validate JS Types - run: | - npm run build-libs - npm run test-ts + run: npm run test-ts env: CI: true @@ -47,9 +48,6 @@ jobs: env: CI: true - - name: Build Libs - run: npm run build-libs - - name: Tests run: npm run test-code env: