From 0064d6f96e90dd3539880ddfff2acdb33be76093 Mon Sep 17 00:00:00 2001 From: yuanhe Date: Sat, 11 Jul 2026 17:59:30 +0800 Subject: [PATCH] chore: narrow ci triggers and clarify dev db target --- .github/workflows/check.yml | 36 +++++++++++++++++++++++++++++++ .github/workflows/govulncheck.yml | 16 ++++++++++++++ .github/workflows/lint.yml | 16 ++++++++++++++ .github/workflows/openapi.yml | 4 ++-- Makefile | 7 ++++-- scripts/dev-all.sh | 2 +- scripts/dev-env.sh | 2 +- 7 files changed, 77 insertions(+), 6 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 3fb439d..825023c 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -9,7 +9,43 @@ name: check on: push: branches: [main] + paths: + - "server/**" + - "internal/**" + - "apps/web/**" + - "packages/cli/**" + - "packages/opencode-plugin/**" + - "packages/eslint-config/**" + - "scripts/**" + - "docker-compose.dev.yml" + - "go.mod" + - "go.sum" + - "go.work" + - "go.work.sum" + - "package.json" + - "pnpm-workspace.yaml" + - "pnpm-lock.yaml" + - "Makefile" + - ".github/workflows/check.yml" pull_request: + paths: + - "server/**" + - "internal/**" + - "apps/web/**" + - "packages/cli/**" + - "packages/opencode-plugin/**" + - "packages/eslint-config/**" + - "scripts/**" + - "docker-compose.dev.yml" + - "go.mod" + - "go.sum" + - "go.work" + - "go.work.sum" + - "package.json" + - "pnpm-workspace.yaml" + - "pnpm-lock.yaml" + - "Makefile" + - ".github/workflows/check.yml" permissions: contents: read diff --git a/.github/workflows/govulncheck.yml b/.github/workflows/govulncheck.yml index 1b39528..cda6e98 100644 --- a/.github/workflows/govulncheck.yml +++ b/.github/workflows/govulncheck.yml @@ -10,7 +10,23 @@ name: govulncheck on: push: branches: [main] + paths: + - "server/**" + - "internal/**" + - "go.mod" + - "go.sum" + - "go.work" + - "go.work.sum" + - ".github/workflows/govulncheck.yml" pull_request: + paths: + - "server/**" + - "internal/**" + - "go.mod" + - "go.sum" + - "go.work" + - "go.work.sum" + - ".github/workflows/govulncheck.yml" schedule: - cron: "17 8 * * 1" diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index eac2424..d4abe7b 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -9,7 +9,23 @@ name: lint on: push: branches: [main] + paths: + - "**/*.go" + - "go.mod" + - "go.sum" + - "go.work" + - "go.work.sum" + - ".golangci.yml" + - ".github/workflows/lint.yml" pull_request: + paths: + - "**/*.go" + - "go.mod" + - "go.sum" + - "go.work" + - "go.work.sum" + - ".golangci.yml" + - ".github/workflows/lint.yml" workflow_dispatch: permissions: diff --git a/.github/workflows/openapi.yml b/.github/workflows/openapi.yml index 594dfc5..cda9905 100644 --- a/.github/workflows/openapi.yml +++ b/.github/workflows/openapi.yml @@ -21,14 +21,14 @@ on: paths: - 'docs/openapi/**' - 'redocly.yaml' - - 'server/**' + - 'server/**/*.go' - '.github/workflows/openapi.yml' - 'Makefile' pull_request: paths: - 'docs/openapi/**' - 'redocly.yaml' - - 'server/**' + - 'server/**/*.go' - '.github/workflows/openapi.yml' - 'Makefile' diff --git a/Makefile b/Makefile index 98d5e62..7438d23 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ SHELL := /bin/bash PARSAR_IMAGE ?= parsar PARSAR_IMAGE_TAG ?= dev -.PHONY: setup dev check reset-dev clean-dev paths migrate-dev sqlc-generate server web cli devgateway http-runner-once http-runner-loop dev-all smoke e2e-http-agent e2e-feishu-gateway dev-server-up dev-server-down dev-server-log bootstrap docker-build docker-build-no-cache openapi +.PHONY: setup dev dev-db check reset-dev clean-dev paths migrate-dev sqlc-generate server web cli devgateway http-runner-once http-runner-loop dev-all smoke e2e-http-agent e2e-feishu-gateway dev-server-up dev-server-down dev-server-log bootstrap docker-build docker-build-no-cache openapi setup: ./scripts/setup.sh @@ -38,9 +38,12 @@ bootstrap: sqlc-generate: cd server && go run github.com/sqlc-dev/sqlc/cmd/sqlc@v1.29.0 generate -dev: +dev-db: ./scripts/dev-stack.sh +# Backward-compatible alias. Prefer `make dev-db` for the DB-only dev stack. +dev: dev-db + check: ./scripts/check.sh diff --git a/scripts/dev-all.sh b/scripts/dev-all.sh index 548add3..1aa1228 100755 --- a/scripts/dev-all.sh +++ b/scripts/dev-all.sh @@ -21,7 +21,7 @@ PY # Pick an ephemeral Postgres port BEFORE sourcing dev-env.sh so its # default (15432) only fills the blank — dev-all intentionally runs on a -# free port to avoid colliding with a `make dev` stack. +# free port to avoid colliding with a `make dev-db` stack. if [[ -z "${PARSAR_POSTGRES_PORT:-}" ]]; then PARSAR_POSTGRES_PORT="$(free_port)" export PARSAR_POSTGRES_PORT diff --git a/scripts/dev-env.sh b/scripts/dev-env.sh index f499784..44e6906 100644 --- a/scripts/dev-env.sh +++ b/scripts/dev-env.sh @@ -8,7 +8,7 @@ # it wins (the `${VAR:-default}` form below only fills in the blank). # # Consumers: -# scripts/dev-stack.sh (make dev) +# scripts/dev-stack.sh (make dev-db; make dev is a compatibility alias) # scripts/dev-all.sh (make dev-all) # scripts/dev-server-up.sh (make dev-server-up) # docker-compose.dev.yml (reads the exported PARSAR_PG_* values;