From 4901482c966a7c8c107fca59614c8a591ade9627 Mon Sep 17 00:00:00 2001 From: Santtu Pajukanta Date: Sun, 9 Aug 2026 15:48:11 +0300 Subject: [PATCH 1/3] ci: run eslint via prek --- .github/workflows/frontend.yaml | 6 ++++++ .github/workflows/lint.yaml | 15 ++------------- kompassi-v2-frontend/.pre-commit-config.yaml | 5 +++++ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/frontend.yaml b/.github/workflows/frontend.yaml index c7d97f410..11d43519b 100644 --- a/.github/workflows/frontend.yaml +++ b/.github/workflows/frontend.yaml @@ -60,6 +60,12 @@ jobs: name: build-json path: kompassi-v2-frontend/build.json + # TODO Placeholder for actual tests, so that we can require step "test" to succeed for automerge (backend actually has one) + test: + runs-on: ubuntu-latest + steps: + - run: "true" + deploy_staging: runs-on: qb-arc-runners needs: build diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 4af648c8a..482829701 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -23,23 +23,12 @@ jobs: - uses: actions/setup-python@v7 with: python-version-file: ".python-version" - - - run: uv sync --locked - - uses: j178/prek-action@v3.0.0 - - eslint: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v7 - - uses: actions/setup-node@v7 with: node-version: 24 cache: npm cache-dependency-path: kompassi-v2-frontend/package-lock.json - - run: npm ci - working-directory: kompassi-v2-frontend + - run: uv sync --locked - - run: npx eslint src - working-directory: kompassi-v2-frontend + - uses: j178/prek-action@v3.0.0 diff --git a/kompassi-v2-frontend/.pre-commit-config.yaml b/kompassi-v2-frontend/.pre-commit-config.yaml index 25edf16a2..ee1300515 100644 --- a/kompassi-v2-frontend/.pre-commit-config.yaml +++ b/kompassi-v2-frontend/.pre-commit-config.yaml @@ -5,3 +5,8 @@ repos: rev: v3.9.6 hooks: - id: prettier + + - repo: https://github.com/pre-commit/mirrors-eslint + rev: v9.39.1 + hooks: + - id: eslint From 4cafea2f60e7576328be958b4ff96dd266443222 Mon Sep 17 00:00:00 2001 From: Santtu Pajukanta Date: Sun, 9 Aug 2026 15:50:20 +0300 Subject: [PATCH 2/3] ci: the npm ci was needed after all --- .github/workflows/lint.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 482829701..fdbd5fcb5 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -30,5 +30,7 @@ jobs: cache-dependency-path: kompassi-v2-frontend/package-lock.json - run: uv sync --locked + - run: npm ci + working-directory: kompassi-v2-frontend - uses: j178/prek-action@v3.0.0 From acba086cfc21913bec4321a983d9e2177120a0bb Mon Sep 17 00:00:00 2001 From: Santtu Pajukanta Date: Sun, 9 Aug 2026 15:52:47 +0300 Subject: [PATCH 3/3] ci: also make prek eslint consider typescript --- kompassi-v2-frontend/.pre-commit-config.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kompassi-v2-frontend/.pre-commit-config.yaml b/kompassi-v2-frontend/.pre-commit-config.yaml index ee1300515..abfe68f8c 100644 --- a/kompassi-v2-frontend/.pre-commit-config.yaml +++ b/kompassi-v2-frontend/.pre-commit-config.yaml @@ -10,3 +10,5 @@ repos: rev: v9.39.1 hooks: - id: eslint + files: \.[jt]sx?$ + types: [file]