From 902863e5ba0591fd04b40f77fe5d3cf5d881ae6f Mon Sep 17 00:00:00 2001 From: AramJonghu Date: Tue, 19 May 2026 23:57:11 +0200 Subject: [PATCH] adjusted workflows -> merge of lint/formatter per lang --- .gitea/workflows/format-js.yml | 26 -------------------------- .gitea/workflows/lint-js.yml | 12 ++++++++++-- .gitea/workflows/lint-python.yml | 16 +++++++++++----- .gitea/workflows/lint-rust.yml | 17 +++++++++++++++-- 4 files changed, 36 insertions(+), 35 deletions(-) delete mode 100644 .gitea/workflows/format-js.yml diff --git a/.gitea/workflows/format-js.yml b/.gitea/workflows/format-js.yml deleted file mode 100644 index 4e6bdc2..0000000 --- a/.gitea/workflows/format-js.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: Format (JS/TS) - -on: - pull_request: - -jobs: - format: - runs-on: alpine - container: node:20-alpine - - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Install tools - run: | - apk add --no-cache \ - git - - - name: Prettier - run: | - if [ -n "$(find . \( -iname "*.js" -o -iname "*.jsx" -o -iname "*.ts" -o -iname "*.tsx" -o -iname "*.mjs" -o -iname "*.cjs" \) -print -quit)" ]; then - npx --yes prettier --check "**/*.{js,jsx,ts,tsx,mjs,cjs}" --ignore-path .gitignore - else - echo "No JS/TS files found" - fi diff --git a/.gitea/workflows/lint-js.yml b/.gitea/workflows/lint-js.yml index 0ef8f3f..4f811df 100644 --- a/.gitea/workflows/lint-js.yml +++ b/.gitea/workflows/lint-js.yml @@ -1,10 +1,10 @@ -name: Lint (JS/TS) +name: Lint & Format (JS/TS) on: pull_request: jobs: - lint: + lint-format: runs-on: alpine container: node:20-alpine @@ -17,6 +17,14 @@ jobs: apk add --no-cache \ git + - name: Prettier + run: | + if [ -n "$(find . \( -iname "*.js" -o -iname "*.jsx" -o -iname "*.ts" -o -iname "*.tsx" -o -iname "*.mjs" -o -iname "*.cjs" \) -print -quit)" ]; then + npx --yes prettier --check "**/*.{js,jsx,ts,tsx,mjs,cjs}" --ignore-path .gitignore + else + echo "No JS/TS files found" + fi + - name: ESLint run: | if [ -n "$(find . \( -iname "*.js" -o -iname "*.jsx" -o -iname "*.ts" -o -iname "*.tsx" -o -iname "*.mjs" -o -iname "*.cjs" \) -print -quit)" ]; then diff --git a/.gitea/workflows/lint-python.yml b/.gitea/workflows/lint-python.yml index e1068f4..eb0220c 100644 --- a/.gitea/workflows/lint-python.yml +++ b/.gitea/workflows/lint-python.yml @@ -1,10 +1,10 @@ -name: Lint (Python) +name: Lint & Format (Python) on: pull_request: jobs: - lint: + lint-format: runs-on: alpine container: node:20-alpine @@ -18,10 +18,16 @@ jobs: git \ python3 \ py3-pip - - - name: Ruff - run: | python3 -m venv .venv . .venv/bin/activate pip install --no-cache-dir ruff + + - name: Format check + run: | + . .venv/bin/activate + ruff format --check . + + - name: Lint + run: | + . .venv/bin/activate ruff check . diff --git a/.gitea/workflows/lint-rust.yml b/.gitea/workflows/lint-rust.yml index 61eecc2..65c9f8b 100644 --- a/.gitea/workflows/lint-rust.yml +++ b/.gitea/workflows/lint-rust.yml @@ -1,10 +1,10 @@ -name: Lint (Rust) +name: Lint & Format (Rust) on: pull_request: jobs: - lint: + lint-format: runs-on: alpine container: node:20-alpine @@ -20,6 +20,19 @@ jobs: rust \ rust-clippy + - name: Format check + run: | + if [ -n "$(find . -name "Cargo.toml" -print -quit)" ]; then + find . -name "Cargo.toml" -print0 | while IFS= read -r -d '' manifest; do + cargo fmt --manifest-path "$manifest" --check + done + elif [ -n "$(find . -name "*.rs" -print -quit)" ]; then + echo "Rust files found but no Cargo.toml" + exit 1 + else + echo "No Rust project found" + fi + - name: Clippy run: | if [ -n "$(find . -name "Cargo.toml" -print -quit)" ]; then