From 1bc20ec8afb221c807c18ddc59cf94aeb08f3541 Mon Sep 17 00:00:00 2001 From: Grant Date: Sun, 26 Jan 2025 21:57:21 -0700 Subject: [PATCH 1/3] add gitlab-ci.yml --- .gitlab-ci.yml | 6 ++++++ package-lock.json | 17 +++++++++++++++++ package.json | 1 + packages/client/package.json | 2 +- packages/server/package.json | 2 +- 5 files changed, 26 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1990d72..4f4f234 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,6 +14,9 @@ eslint client: script: - npm i --include=dev - npm -w packages/client run lint + artifacts: + reports: + codequality: packages/client/gl-codequality.json eslint server: stage: lint @@ -25,6 +28,9 @@ eslint server: script: - npm i --include=dev - npm -w packages/server run lint + artifacts: + reports: + codequality: packages/server/gl-codequality.json build wiki: stage: build diff --git a/package-lock.json b/package-lock.json index de22e10..5062cda 100644 --- a/package-lock.json +++ b/package-lock.json @@ -40,6 +40,7 @@ "dotenv-cli": "^8.0.0", "eslint": "^8.57.0", "eslint-config-react-app": "^7.0.1", + "eslint-formatter-gitlab": "^5.1.0", "eslint-plugin-react-hooks": "^5.1.0", "eslint-plugin-simple-import-sort": "^12.1.1", "nodemon": "^3.1.9", @@ -10581,6 +10582,22 @@ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true }, + "node_modules/eslint-formatter-gitlab": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/eslint-formatter-gitlab/-/eslint-formatter-gitlab-5.1.0.tgz", + "integrity": "sha512-IxhrjLYzDlbFgPWEnvZlWLwPjMeyymbyo0hDHWntZ3DSAP9AP9huj15KbU+BK3OqeO3OHhbFEh2TA6sR0KZhkA==", + "dev": true, + "dependencies": { + "chalk": "^4.0.0", + "yaml": "^2.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/remcohaszing" + }, + "peerDependencies": { + "eslint": ">=5" + } + }, "node_modules/eslint-import-resolver-node": { "version": "0.3.9", "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz", diff --git a/package.json b/package.json index ed34b0b..6c4afd3 100644 --- a/package.json +++ b/package.json @@ -39,6 +39,7 @@ "dotenv-cli": "^8.0.0", "eslint": "^8.57.0", "eslint-config-react-app": "^7.0.1", + "eslint-formatter-gitlab": "^5.1.0", "eslint-plugin-react-hooks": "^5.1.0", "eslint-plugin-simple-import-sort": "^12.1.1", "nodemon": "^3.1.9", diff --git a/packages/client/package.json b/packages/client/package.json index e59f9ef..c034012 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -7,7 +7,7 @@ "build": "vite build", "dev": "vite serve", "preview": "vite preview", - "lint": "eslint ." + "lint": "eslint --format gitlab ." }, "type": "module", "keywords": [], diff --git a/packages/server/package.json b/packages/server/package.json index 952af2b..7059955 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -7,7 +7,7 @@ "profiler": "node --inspect=0.0.0.0:9229 --enable-source-maps dist/index.js", "build": "tsc", "sentry": "sentry-cli sourcemaps inject dist && SENTRY_RELEASE=`sentry-cli releases propose-version` sentry-cli sourcemaps upload dist", - "lint": "eslint .", + "lint": "eslint --format gitlab .", "prisma:studio": "dotenv -v BROWSER=none -e .env.local -- prisma studio", "prisma:migrate": "prisma migrate deploy", "prisma:seed:palette": "./tool.sh seed_palette", -- GitLab From 91ded1b96ddd2a1ab52787fc8fded13a807ef910 Mon Sep 17 00:00:00 2001 From: Grant Date: Sun, 26 Jan 2025 22:00:15 -0700 Subject: [PATCH 2/3] trigger ci --- packages/client/src/ci-test | 0 packages/server/src/ci-test | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 packages/client/src/ci-test create mode 100644 packages/server/src/ci-test diff --git a/packages/client/src/ci-test b/packages/client/src/ci-test new file mode 100644 index 0000000..e69de29 diff --git a/packages/server/src/ci-test b/packages/server/src/ci-test new file mode 100644 index 0000000..e69de29 -- GitLab From b9897156c57992cc5f398a03d693a1e9b877a3ad Mon Sep 17 00:00:00 2001 From: Grant Date: Sun, 26 Jan 2025 22:11:11 -0700 Subject: [PATCH 3/3] Revert "trigger ci" This reverts commit 91ded1b96ddd2a1ab52787fc8fded13a807ef910. --- packages/client/src/ci-test | 0 packages/server/src/ci-test | 0 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 packages/client/src/ci-test delete mode 100644 packages/server/src/ci-test diff --git a/packages/client/src/ci-test b/packages/client/src/ci-test deleted file mode 100644 index e69de29..0000000 diff --git a/packages/server/src/ci-test b/packages/server/src/ci-test deleted file mode 100644 index e69de29..0000000 -- GitLab