chore: reduce root cleanup files · openclaw/openclaw@1f1686b
steipete
·
2026-05-03
·
via Recent Commits to openclaw:main
| Original file line number | Diff line number | Diff line change |
|---|
@@ -217,9 +217,8 @@
|
217 | 217 | - "Dockerfile" |
218 | 218 | - "Dockerfile.*" |
219 | 219 | - "docker-compose.yml" |
220 | | - - "docker-setup.sh" |
221 | | - - "setup-podman.sh" |
222 | 220 | - ".dockerignore" |
| 221 | + - "deploy/fly.private.toml" |
223 | 222 | - "scripts/docker/setup.sh" |
224 | 223 | - "scripts/docker/sandbox/Dockerfile*" |
225 | 224 | - "scripts/podman/setup.sh" |
|
| Original file line number | Diff line number | Diff line change |
|---|
@@ -1769,10 +1769,10 @@ jobs:
|
1769 | 1769 | python -m pip install pytest ruff pyyaml |
1770 | 1770 | |
1771 | 1771 | - name: Lint Python skill scripts |
1772 | | -run: python -m ruff check skills |
| 1772 | +run: python -m ruff check --config skills/pyproject.toml skills |
1773 | 1773 | |
1774 | 1774 | - name: Test skill Python scripts |
1775 | | -run: python -m pytest -q skills |
| 1775 | +run: python -m pytest -q -c skills/pyproject.toml skills |
1776 | 1776 | |
1777 | 1777 | checks-windows: |
1778 | 1778 | permissions: |
|
File renamed without changes.
| Original file line number | Diff line number | Diff line change |
|---|
@@ -40,7 +40,14 @@ repos:
|
40 | 40 | rev: v1.22.0 |
41 | 41 | hooks: |
42 | 42 | - id: zizmor |
43 | | -args: [--persona=regular, --min-severity=medium, --min-confidence=medium] |
| 43 | +args: |
| 44 | +[ |
| 45 | +--config, |
| 46 | +.github/zizmor.yml, |
| 47 | +--persona=regular, |
| 48 | +--min-severity=medium, |
| 49 | +--min-confidence=medium, |
| 50 | +] |
44 | 51 | exclude: "^(vendor/|apps/swabble/)" |
45 | 52 | |
46 | 53 | # Python checks for skills scripts |
@@ -49,13 +56,13 @@ repos:
|
49 | 56 | hooks: |
50 | 57 | - id: ruff |
51 | 58 | files: "^skills/.*\\.py$" |
52 | | -args: [--config, pyproject.toml] |
| 59 | +args: [--config, skills/pyproject.toml] |
53 | 60 | |
54 | 61 | - repo: local |
55 | 62 | hooks: |
56 | 63 | - id: skills-python-tests |
57 | 64 | name: skills python tests |
58 | | -entry: pytest -q skills |
| 65 | +entry: pytest -q -c skills/pyproject.toml skills |
59 | 66 | language: python |
60 | 67 | additional_dependencies: [pytest>=8, <9] |
61 | 68 | pass_filenames: false |
|
File renamed without changes.
| Original file line number | Diff line number | Diff line change |
|---|
@@ -45,7 +45,7 @@ read_when:
|
45 | 45 | <Step title="Configure fly.toml"> |
46 | 46 | Edit `fly.toml` to match your app name and requirements. |
47 | 47 | |
48 | | -**Security note:** The default config exposes a public URL. For a hardened deployment with no public IP, see [Private Deployment](#private-deployment-hardened) or use `fly.private.toml`. |
| 48 | +**Security note:** The default config exposes a public URL. For a hardened deployment with no public IP, see [Private Deployment](#private-deployment-hardened) or use `deploy/fly.private.toml`. |
49 | 49 | |
50 | 50 | ```toml |
51 | 51 | app = "my-openclaw" # Your app name |
@@ -392,11 +392,11 @@ For a hardened deployment with **no public exposure**, use the private template.
|
392 | 392 | |
393 | 393 | ### Setup |
394 | 394 | |
395 | | -Use `fly.private.toml` instead of the standard config: |
| 395 | +Use `deploy/fly.private.toml` instead of the standard config: |
396 | 396 | |
397 | 397 | ```bash |
398 | 398 | # Deploy with private config |
399 | | -fly deploy -c fly.private.toml |
| 399 | +fly deploy -c deploy/fly.private.toml |
400 | 400 | ``` |
401 | 401 | |
402 | 402 | Or convert an existing deployment: |
@@ -411,7 +411,7 @@ fly ips release <public-ipv6> -a my-openclaw
|
411 | 411 | |
412 | 412 | # Switch to private config so future deploys don't re-allocate public IPs |
413 | 413 | # (remove [http_service] or deploy with the private template) |
414 | | -fly deploy -c fly.private.toml |
| 414 | +fly deploy -c deploy/fly.private.toml |
415 | 415 | |
416 | 416 | # Allocate private-only IPv6 |
417 | 417 | fly ips allocate-v6 --private -a my-openclaw |
|
| Original file line number | Diff line number | Diff line change |
|---|
@@ -9,7 +9,7 @@ const APP_PATH_RE = /^(?:apps\/|Swabble\/|appcast\.xml$)/u;
|
9 | 9 | const EXTENSION_PATH_RE = /^extensions\/[^/]+(?:\/|$)/u; |
10 | 10 | const CORE_PATH_RE = /^(?:src\/|ui\/|packages\/)/u; |
11 | 11 | const TOOLING_PATH_RE = |
12 | | -/^(?:scripts\/|test\/vitest\/|\.github\/|\.vscode\/|git-hooks\/|Dockerfile\.sandbox(?:-(?:browser|common))?$|Makefile$|openclaw\.podman\.env$|vitest(?:\..+)?\.config\.ts$|tsconfig.*\.json$|\.dockerignore$|\.gitignore$|\.jscpd\.json$|\.npmignore$|\.pre-commit-config\.yaml$|\.swiftformat$|\.oxlint.*|\.oxfmt.*)/u; |
| 12 | +/^(?:scripts\/|test\/vitest\/|\.github\/|\.vscode\/|deploy\/|git-hooks\/|Dockerfile\.sandbox(?:-(?:browser|common))?$|Makefile$|docker-setup\.sh$|setup-podman\.sh$|openclaw\.podman\.env$|skills\/pyproject\.toml$|vitest(?:\..+)?\.config\.ts$|tsconfig.*\.json$|\.dockerignore$|\.gitignore$|\.jscpd\.json$|\.npmignore$|\.pre-commit-config\.yaml$|\.swiftformat$|\.oxlint.*|\.oxfmt.*)/u; |
13 | 13 | const ROOT_GLOBAL_PATH_RE = |
14 | 14 | /^(?:package\.json$|pnpm-lock\.yaml$|pnpm-workspace\.yaml$|tsdown\.config\.ts$|vitest\.config\.ts$)/u; |
15 | 15 | const LEGACY_ROOT_ASSET_PATH_RE = /^assets\//u; |
|
| Original file line number | Diff line number | Diff line change |
|---|
@@ -26,7 +26,7 @@ const EMPTY_SCOPE = {
|
26 | 26 | }; |
27 | 27 | |
28 | 28 | const DOCS_PATH_RE = /^(docs\/|.*\.mdx?$)/; |
29 | | -const SKILLS_PYTHON_SCOPE_RE = /^(skills\/|pyproject\.toml$)/; |
| 29 | +const SKILLS_PYTHON_SCOPE_RE = /^(skills\/|skills\/pyproject\.toml$)/; |
30 | 30 | const INSTALL_SMOKE_WORKFLOW_SCOPE_RE = /^\.github\/workflows\/install-smoke\.yml$/; |
31 | 31 | const MACOS_PROTOCOL_GEN_RE = |
32 | 32 | /^(apps\/macos\/Sources\/OpenClawProtocol\/|apps\/shared\/OpenClawKit\/Sources\/OpenClawProtocol\/)/; |
|
| Original file line number | Diff line number | Diff line change |
|---|
@@ -145,7 +145,7 @@ The Docker setup uses three config files on the host. The container never stores
|
145 | 145 | | -------------------------- | -------------------------------------------------------------------------- | |
146 | 146 | | `Dockerfile` | Builds the `openclaw:local` image (Node 22, pnpm, non-root `node` user) | |
147 | 147 | | `docker-compose.yml` | Defines `openclaw-gateway` and `openclaw-cli` services, bind-mounts, ports | |
148 | | -| `docker-setup.sh` | First-time setup — builds image, creates `.env` from `.env.example` | |
| 148 | +| `scripts/docker/setup.sh` | First-time setup — builds image, creates `.env` from `.env.example` | |
149 | 149 | | `.env.example` | Template for `<project>/.env` with all supported vars and docs | |
150 | 150 | | `docker-compose.extra.yml` | Optional overrides — auto-loaded by ClawDock helpers if present | |
151 | 151 | |
@@ -161,14 +161,14 @@ The Docker setup uses three config files on the host. The container never stores
|
161 | 161 | |
162 | 162 | ### Initial Setup |
163 | 163 | |
164 | | -`./docker-setup.sh` (in the project root) handles first-time Docker configuration: |
| 164 | +`./scripts/docker/setup.sh` handles first-time Docker configuration: |
165 | 165 | |
166 | 166 | - Builds the `openclaw:local` image from `Dockerfile` |
167 | 167 | - Creates `<project>/.env` from `.env.example` with a generated gateway token |
168 | 168 | - Sets up `~/.openclaw` directories if they don't exist |
169 | 169 | |
170 | 170 | ```bash |
171 | | -./docker-setup.sh |
| 171 | +./scripts/docker/setup.sh |
172 | 172 | ``` |
173 | 173 | |
174 | 174 | After setup, add your API keys: |
|
此内容由惯性聚合(RSS阅读器)自动聚合整理,仅供阅读参考。 原文来自 — 版权归原作者所有。