Skip to content

Commit 1b0c9a7

Browse files
committed
Merge branch 'release/5.37.0'
2 parents cd93cef + 12fabf0 commit 1b0c9a7

55 files changed

Lines changed: 1066 additions & 103 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.devcontainer/certs/.gitkeep

Whitespace-only changes.

.devcontainer/devcontainer.json

100755100644
File mode changed.
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<!-- @format -->
2+
3+
# common-utils
4+
5+
## Description
6+
7+
Use this feature as a shared utility layer for shell-based automation across features (`jq`, `dos2unix`, and `zz_*` helper scripts).
8+
9+
## Commands
10+
11+
- `validate-json [options] <json>` - Validate JSON against a schema.
12+
- `normalize-json [options] <json>` - Normalize JSON order/format using schema rules.
13+
- `zz_dist [options]` - Copy `zz_*` helpers to a target directory.
14+
- `zz_args` - Parse command-line arguments in shell scripts.
15+
- `zz_log` - Emit structured/colorized shell logs.
16+
- `zz_json` - Read or manipulate JSON from shell scripts.
17+
18+
## Use For
19+
20+
- JSON validation/normalization workflows (`validate-json`, `normalize-json`).
21+
- Shell scripting with standardized logging, argument parsing, and prompts (`zz_log`, `zz_args`, `zz_ask`).
22+
- Distributing shared helper scripts into project folders (`zz_dist`).
23+
24+
## Do Not Use For
25+
26+
- Feature-specific business logic.
27+
- Git workflow automation (use `gitutils` or `githooks`).
28+
29+
## Agent Guidance
30+
31+
- Reuse existing `zz_*` scripts before adding new helpers.
32+
- Prefer `normalize-json`/`validate-json` in lint pipelines for schema-safe edits.
33+
- Keep automation generic and composable for cross-feature reuse.
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<!-- @format -->
2+
3+
# githooks
4+
5+
## Description
6+
7+
Use this feature when an agent needs consistent local Git quality gates and commit workflow automation.
8+
9+
## Commands
10+
11+
- `git commit` - Triggers `pre-commit`, `prepare-commit-msg`, and `commit-msg` hooks.
12+
- `git push` - Triggers `pre-push` validations before remote update.
13+
- `git checkout <branch>` - Triggers `post-checkout` hook operations.
14+
- `git merge` - Triggers `post-merge` hook operations.
15+
- `commitlint --edit <file>` - Validate a commit message against commitlint rules.
16+
- `lint-staged` - Run configured lint/format commands on staged files.
17+
18+
## Use For
19+
20+
- Enforcing commit message standards (`commitlint`, `commitizen`).
21+
- Running pre-commit checks/linting on staged files.
22+
- Validating branch naming and push readiness.
23+
- Keeping dependencies aligned after checkout/merge hooks.
24+
25+
## Do Not Use For
26+
27+
- Repository history rewriting (use `gitutils`).
28+
- Version calculation from history (use `gitversion`).
29+
30+
## Agent Guidance
31+
32+
- Treat hooks as the default guardrails for local commits.
33+
- Update hook-related package snippets/scripts instead of introducing duplicate checks.
34+
- When failures occur, fix the underlying issue and rerun the same hook path.
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<!-- @format -->
2+
3+
# gitutils
4+
5+
## Description
6+
7+
Use this feature for advanced Git operations, interactive repository maintenance, and git-flow shortcuts.
8+
9+
## Commands
10+
11+
- `git align` - Align current branch with its remote tracking branch.
12+
- `git integrate` - Integrate remote modifications into current branch.
13+
- `git fixup [--force|<commit>]` - Amend a target commit and rebase history.
14+
- `git getcommit [--force|<commit>]` - Resolve/select commit target for fixup.
15+
- `git fix date [options] [<commit>]` - Rewrite commit times with scheduling rules.
16+
- `git forall <command>` - Execute a command for repository files.
17+
- `git release-beta` - Start a Git Flow release branch.
18+
- `git release-hotfix` - Start a Git Flow hotfix branch.
19+
- `git release-prod` - Finish release/hotfix flow for production.
20+
- `git unset <prefix> [--local|--global|--system]` - Remove git config keys by prefix.
21+
22+
## Use For
23+
24+
- Branch/rebase alignment and integration tasks.
25+
- Commit cleanup/fixup workflows.
26+
- Release branch shortcuts (`beta`, `hfix`, `prod`).
27+
- Batch repository operations and helper aliases.
28+
29+
## Do Not Use For
30+
31+
- Commit policy enforcement hooks (use `githooks`).
32+
- Semantic version calculation (use `gitversion`).
33+
34+
## Agent Guidance
35+
36+
- Prefer built-in aliases/utilities before crafting raw multi-step Git commands.
37+
- For history-rewrite actions, use explicit/force flags only when requested.
38+
- Keep operations scoped and reversible where possible.
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<!-- @format -->
2+
3+
# gitversion
4+
5+
## Description
6+
7+
Use this feature when an agent must derive application version numbers from Git history in a consistent way.
8+
9+
## Commands
10+
11+
- `gv` - Compute version metadata from Git history.
12+
- `bump-version` - Update version fields/files from computed version.
13+
- `bump-tag` - Create/update version tag from release version.
14+
- `bump-changelog` - Generate or update changelog for release context.
15+
16+
## Use For
17+
18+
- Calculating semantic versions from branch/commit state.
19+
- Providing version metadata for build/release automation.
20+
- Aligning local version behavior with CI versioning.
21+
22+
## Do Not Use For
23+
24+
- Manual tag/edit workflows without GitVersion involvement.
25+
- Hook or lint orchestration (use `githooks`).
26+
27+
## Agent Guidance
28+
29+
- Use the installed GitVersion tooling as the source of truth for computed versions.
30+
- Keep versioning logic centralized; avoid duplicating derivation rules in scripts.
31+
- Pair with release helpers only when version flow is explicitly required.

.github/workflow/rebase-pr.yml

Lines changed: 0 additions & 28 deletions
This file was deleted.

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
*.log
1212
*.cache
1313

14+
## Feature Skills
15+
.github/skills/feature-*/*.md
16+
1417
## Misc
1518
VERSION
1619
.history

CHANGELOG.md

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,38 @@
22

33
# Changelog
44

5+
## 5.37.0 (2026-03-20)
6+
7+
_Commits from: v5.36.0..HEAD_
8+
9+
### 📂 Unscoped changes
10+
11+
#### Bug Fixes
12+
13+
- 🐛 add mounts configuration for certs ([2836888](https://github.com/tomgrv/devcontainer-features/commit/283688826afe6d71e7f9b23d4578c8eebd2c4b5c))
14+
- 🐛 correct color formatting in prompt message ([69de0ca](https://github.com/tomgrv/devcontainer-features/commit/69de0ca7189c502c06e50d95995d36577c366c6c))
15+
- 🐛 correct container message to remove unnecessary feature variable ([a7abd81](https://github.com/tomgrv/devcontainer-features/commit/a7abd813e9a9af3398af11d3a4319ab5b2023a3d))
16+
- 🐛 correct job dependency name in validate-pr-php.yml ([06558b3](https://github.com/tomgrv/devcontainer-features/commit/06558b36007b9b4d60956dafab3e42fb82b3d1be))
17+
- 🐛 correct rebase loop condition to handle errors properly ([a6724e3](https://github.com/tomgrv/devcontainer-features/commit/a6724e34a9bc1b4e893ae514ba3d69b37056bf12))
18+
- 🐛 correct remote branch reference in merge-base check ([f958c6f](https://github.com/tomgrv/devcontainer-features/commit/f958c6f9bbacde3444a9c03ca9e0188e502e40be))
19+
- 🐛 fix docker-gitversion wrapper generation ([caf9319](https://github.com/tomgrv/devcontainer-features/commit/caf9319e1b632f69f1dd571e38f642ef43e3334c))
20+
- 🐛 update commit retrieval method to ensure valid sha ([e497be6](https://github.com/tomgrv/devcontainer-features/commit/e497be6b41d376c649afb1be9594b8747c3a7428))
21+
- 🐛 update container message to use feature variable ([0fa1848](https://github.com/tomgrv/devcontainer-features/commit/0fa18482b12be42fbe97d2ef231072d0df4430c3))
22+
23+
#### Features
24+
25+
- ✨ add global installation option for npm plugins ([95e35b9](https://github.com/tomgrv/devcontainer-features/commit/95e35b92f0d19858a878e5a52606157b0770f364))
26+
- ✨ add script to rewrite commit messages ([ccd1bd1](https://github.com/tomgrv/devcontainer-features/commit/ccd1bd173bd28d03ea0328f7c392d1bb28129834))
27+
- ✨ add ssh inspection gateway support ([40b4faf](https://github.com/tomgrv/devcontainer-features/commit/40b4fafdbf99be2ba520552f6ee3fee124840300))
28+
29+
#### Other changes
30+
31+
- ♻️ 🛠️ improve logging and user prompts in \_git-fix-base.sh ([655ab3c](https://github.com/tomgrv/devcontainer-features/commit/655ab3c2ed65b688118e8fdbb4079bdc24797ca6))
32+
- Merge tag 'v5.36.0' into develop ([ef8556b](https://github.com/tomgrv/devcontainer-features/commit/ef8556be258b5374417af479266bd69626508c8a))
33+
- 🔧 rebuild container ([86527ea](https://github.com/tomgrv/devcontainer-features/commit/86527ead36e86f07a57dc6f8a43baa749b780f71))
34+
- 🔧 remove automatic rebase workflow file ([9de80ca](https://github.com/tomgrv/devcontainer-features/commit/9de80ca8fbf2f9ae9741902b75a35163dfa9bcba))
35+
- 🔧 update .gitignore files to include feature skill paths ([039813e](https://github.com/tomgrv/devcontainer-features/commit/039813eae989ad79a845873e3be7184051fb8da8))
36+
537
## 5.36.0 (2026-02-27)
638

739
_Commits from: v5.35.0..HEAD_
@@ -428,4 +460,4 @@ _Commits from: v5.25.0..HEAD_
428460

429461
---
430462

431-
_Generated on 2026-02-27 by [tomgrv/devcontainer-features](https://github.com/tomgrv/devcontainer-features)_
463+
_Generated on 2026-03-20 by [tomgrv/devcontainer-features](https://github.com/tomgrv/devcontainer-features)_

install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ if [ -n "$features" ]; then
129129

130130
else
131131
# If inside a container, suggest using devutils as devcontainer features
132-
echo "${Purple}You are in a container: use devutils as devcontainer features:${End}"
132+
echo "${Purple}You are in a container: use as devcontainer features:${End}"
133133
for feature in $features; do
134134
echo "${Purple}ghcr.io/tomgrv/devcontainer-features/$feature${End}"
135135
done

0 commit comments

Comments
 (0)