From 5633b5d389e2c7bbead54980c8e399ee69eeec9e Mon Sep 17 00:00:00 2001 From: Phillip Moore Date: Fri, 22 May 2026 11:27:00 -0400 Subject: [PATCH 1/4] chore(ci): add missing container-tag/container-suffix and fix stale standards doc Add container-tag and container-suffix parameters to all reusable workflow jobs (audit, quality, security, test, version) in ci.yml. Fix repository-standards.md: correct git hooks path, rename st-submit-pr to vrg-submit-pr, replace markdownlint requirement with vrg-docker-run, remove stale --agent and --docs-only flags, fix --linkage default from Fixes to Ref. Addresses vergil-project/vergil-tooling#1015, vergil-project/vergil-tooling#1013 Co-Authored-By: Claude --- .github/workflows/ci.yml | 10 ++++++++++ docs/repository-standards.md | 14 ++++++-------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b44b0e9..d5e5b2c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,6 +37,8 @@ jobs: with: language: java versions: ${{ inputs.java-versions || '["17", "21"]' }} + container-suffix: java + container-tag: 'latest' integration-tests: name: "test / integration / ${{ matrix.java-version }}" @@ -87,6 +89,8 @@ jobs: with: language: java versions: ${{ inputs.java-versions || '["17", "21"]' }} + container-suffix: java + container-tag: 'latest' security: uses: vergil-project/vergil-actions/.github/workflows/ci-security.yml@v2.0 @@ -94,6 +98,8 @@ jobs: language: java run-standards: ${{ inputs.run-release != 'false' }} run-security: ${{ inputs.run-security != 'false' }} + container-suffix: java + container-tag: 'latest' permissions: contents: read security-events: write @@ -103,9 +109,13 @@ jobs: with: language: java versions: ${{ inputs.java-versions || '["17", "21"]' }} + container-suffix: java + container-tag: 'latest' version: uses: vergil-project/vergil-actions/.github/workflows/ci-version-bump.yml@v2.0 with: language: java run-release: ${{ inputs.run-release != 'false' }} + container-suffix: java + container-tag: 'latest' diff --git a/docs/repository-standards.md b/docs/repository-standards.md index cfe389d..0de72dc 100644 --- a/docs/repository-standards.md +++ b/docs/repository-standards.md @@ -14,7 +14,7 @@ - Before modifying any files, check the current branch with `git status -sb`. - If on `develop`, create a short-lived `feature/*` branch or ask for explicit approval to proceed on `develop`. - If approval is granted to work on `develop`, call it out in the response and proceed only for that user-approved scope. -- Enable repository git hooks before committing: `git config core.hooksPath scripts/git-hooks`. +- Enable repository git hooks before committing: `git config core.hooksPath .githooks`. ## Local validation @@ -46,7 +46,7 @@ Required for daily workflow: - Java 17+ (`brew install openjdk@17` or SDKMAN) - Maven Wrapper (`./mvnw`, checked into repo -- no separate Maven install needed) -- `markdownlint` (required for docs validation and PR pre-submission) +- `vrg-docker-run` (runs validation inside dev container) ## Merge strategy override @@ -66,14 +66,13 @@ submission. Do not construct commit messages or PR bodies manually. ```bash vrg-commit \ - --type TYPE --message MESSAGE --agent AGENT \ + --type TYPE --message MESSAGE \ [--scope SCOPE] [--body BODY] ``` - `--type` (required): one of `feat|fix|docs|style|refactor|test|chore|ci|build` - `--message` (required): commit description -- `--agent` (required): `claude` or `codex` - `--scope` (optional): conventional commit scope - `--body` (optional): detailed commit body @@ -83,20 +82,19 @@ The script resolves the correct `Co-Authored-By` identity from ### Submitting PRs ```bash -st-submit-pr \ +vrg-submit-pr \ --issue NUMBER --summary TEXT \ [--linkage KEYWORD] [--title TEXT] \ - [--notes TEXT] [--docs-only] [--dry-run] + [--notes TEXT] [--dry-run] ``` - `--issue` (required): GitHub issue number (just the number) - `--summary` (required): one-line PR summary -- `--linkage` (optional, default: `Fixes`): +- `--linkage` (optional, default: `Ref`): `Fixes|Closes|Resolves|Ref` - `--title` (optional): PR title (default: most recent commit subject) - `--notes` (optional): additional notes -- `--docs-only` (optional): applies docs-only testing exception - `--dry-run` (optional): print generated PR without executing The script detects the target branch and merge strategy From 6914e1b78b5bb3a40ce9d900cbc001fec764ac27 Mon Sep 17 00:00:00 2001 From: Phillip Moore Date: Fri, 22 May 2026 11:57:42 -0400 Subject: [PATCH 2/4] fix(ci): use base container suffix for common CI jobs --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d5e5b2c..56f14fb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,7 +37,7 @@ jobs: with: language: java versions: ${{ inputs.java-versions || '["17", "21"]' }} - container-suffix: java + container-suffix: base container-tag: 'latest' integration-tests: @@ -89,7 +89,7 @@ jobs: with: language: java versions: ${{ inputs.java-versions || '["17", "21"]' }} - container-suffix: java + container-suffix: base container-tag: 'latest' security: @@ -98,7 +98,7 @@ jobs: language: java run-standards: ${{ inputs.run-release != 'false' }} run-security: ${{ inputs.run-security != 'false' }} - container-suffix: java + container-suffix: base container-tag: 'latest' permissions: contents: read @@ -109,7 +109,7 @@ jobs: with: language: java versions: ${{ inputs.java-versions || '["17", "21"]' }} - container-suffix: java + container-suffix: base container-tag: 'latest' version: @@ -117,5 +117,5 @@ jobs: with: language: java run-release: ${{ inputs.run-release != 'false' }} - container-suffix: java + container-suffix: base container-tag: 'latest' From 81a76d279f1200d76366054c5a2ebaccdfce699a Mon Sep 17 00:00:00 2001 From: Phillip Moore Date: Fri, 22 May 2026 12:21:46 -0400 Subject: [PATCH 3/4] fix(ci): revert container params and add VERSION file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove container-suffix/container-tag from ci.yml — workflow defaults are correct for Java repos. Add canonical VERSION file (1.2.2) for vrg-version. Co-Authored-By: Claude Opus 4.6 --- .github/workflows/ci.yml | 10 ---------- VERSION | 1 + 2 files changed, 1 insertion(+), 10 deletions(-) create mode 100644 VERSION diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 56f14fb..b44b0e9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,8 +37,6 @@ jobs: with: language: java versions: ${{ inputs.java-versions || '["17", "21"]' }} - container-suffix: base - container-tag: 'latest' integration-tests: name: "test / integration / ${{ matrix.java-version }}" @@ -89,8 +87,6 @@ jobs: with: language: java versions: ${{ inputs.java-versions || '["17", "21"]' }} - container-suffix: base - container-tag: 'latest' security: uses: vergil-project/vergil-actions/.github/workflows/ci-security.yml@v2.0 @@ -98,8 +94,6 @@ jobs: language: java run-standards: ${{ inputs.run-release != 'false' }} run-security: ${{ inputs.run-security != 'false' }} - container-suffix: base - container-tag: 'latest' permissions: contents: read security-events: write @@ -109,13 +103,9 @@ jobs: with: language: java versions: ${{ inputs.java-versions || '["17", "21"]' }} - container-suffix: base - container-tag: 'latest' version: uses: vergil-project/vergil-actions/.github/workflows/ci-version-bump.yml@v2.0 with: language: java run-release: ${{ inputs.run-release != 'false' }} - container-suffix: base - container-tag: 'latest' diff --git a/VERSION b/VERSION new file mode 100644 index 0000000..23aa839 --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +1.2.2 From 7efd47edd320d78bc8e659230644a2492af3abfc Mon Sep 17 00:00:00 2001 From: Phillip Moore Date: Fri, 22 May 2026 12:28:50 -0400 Subject: [PATCH 4/4] fix(ci): add container-suffix to audit and test jobs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The ci-audit and ci-test reusable workflows default container-suffix to base, which produces prod-base: — an image that does not exist. Set container-suffix: java so these jobs use prod-java:. Co-Authored-By: Claude Opus 4.6 --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b44b0e9..26d1bc9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,6 +37,7 @@ jobs: with: language: java versions: ${{ inputs.java-versions || '["17", "21"]' }} + container-suffix: java integration-tests: name: "test / integration / ${{ matrix.java-version }}" @@ -103,6 +104,7 @@ jobs: with: language: java versions: ${{ inputs.java-versions || '["17", "21"]' }} + container-suffix: java version: uses: vergil-project/vergil-actions/.github/workflows/ci-version-bump.yml@v2.0