diff --git a/README.md b/README.md index 4e2c740..415452e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,9 @@ # ci-scripts -Shared Woodpecker CI templates, plugins, and centralized pipeline conventions for the Oleks ecosystem. This repository hosts reusable CI components (clone steps, build templates, arch-specific runners) and tracks the cross-repo CI optimization effort to reduce duplication across ~50 projects in ~/projects. +Shared Woodpecker CI templates, plugins, and centralized pipeline conventions +for the Oleks ecosystem. This repository hosts reusable CI components (clone +steps, build templates, arch-specific runners) and tracks the cross-repo CI +optimization effort to reduce duplication across ~50 projects in ~/projects. ## pypi-wheel-attic template (oleks/ci-scripts#1) @@ -22,7 +25,7 @@ publish, binary builds, multi-file workflows) and are also out of scope. Verify with: -``` +```sh python3 generate.py --check # fails if any rendered file is stale woodpecker-cli lint /.woodpecker.yaml ``` @@ -65,6 +68,10 @@ converted to explicit exit-code handling that still tolerates the benign case killed) without masking anything else: ```yaml -- if ! kill $ATTIC_PID 2>/dev/null; then echo "attic watch-store already exited"; fi -- if ! wait $ATTIC_PID 2>/dev/null; then echo "attic watch-store exited non-zero after kill (expected)"; fi +- if ! kill $ATTIC_PID 2>/dev/null; then + echo "attic watch-store already exited" + fi +- if ! wait $ATTIC_PID 2>/dev/null; then + echo "attic watch-store exited non-zero after kill (expected)" + fi ``` diff --git a/generate.py b/generate.py index 364dbf2..c5df91f 100644 --- a/generate.py +++ b/generate.py @@ -4,6 +4,7 @@ GENERATED files carry a "do not hand-edit" header; edit manifest.yaml instead and re-run this script. See manifest.yaml for scope notes (oleks/ci-scripts#1). """ + import pathlib import sys @@ -65,7 +66,7 @@ def render(repo: dict) -> str: if attic: attic_block = ( - ' # Push built paths to the binary cache while we build.\n' + " # Push built paths to the binary cache while we build.\n" ' - attic login ci https://nix-cache-upload.oleks.space "$ATTIC_TOKEN"\n' " - attic watch-store attic-infra-cache-k3s-1 &\n" " - ATTIC_PID=$!\n"