Skip to content

Commit 7e8a860

Browse files
tomgrvtomgrv
committed
Merge branch 'release/5.30.0'
2 parents bdcdaa8 + 9ad4785 commit 7e8a860

12 files changed

Lines changed: 106 additions & 94 deletions

‎CHANGELOG.md‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,29 @@
22

33
# Changelog
44

5+
## 5.30.0-beta.1 (2025-10-02)
6+
7+
_Commits from: v5.29.1..HEAD_
8+
9+
### 📂 Unscoped changes
10+
11+
#### Other changes
12+
13+
- Merge tag 'v5.28.1' into develop ([9249443](https://github.com/tomgrv/devcontainer-features/commit/924944383f11e06b79ea6632f21c6bc4cd783eff))
14+
- Merge tag 'v5.29.1' into develop ([9fb75b6](https://github.com/tomgrv/devcontainer-features/commit/9fb75b61e0ea7396099711fdba5886f488406883))
15+
16+
### 📦 gitutils changes
17+
18+
#### Bug Fixes
19+
20+
- 🐛 update version retrieval ([2e1d1c5](https://github.com/tomgrv/devcontainer-features/commit/2e1d1c56fec50d6a6d9311d6e69d4a62a50caecf))
21+
22+
### 📦 gitversion changes
23+
24+
#### Bug Fixes
25+
26+
- 🐛 correct version determination ([510e87c](https://github.com/tomgrv/devcontainer-features/commit/510e87ca1a4ed527be33fff5e58bd2b6784688b3))
27+
528
## 5.29.1-beta.1 (2025-10-02)
629

730
_Commits from: v5.29.0..HEAD_

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tomgrv/devcontainer-features",
3-
"version": "5.29.1-beta.1",
3+
"version": "5.30.0-beta.1",
44
"description": "Configure dev environment with devcontainer, gitflow, gitversion, git aliases & hooks. Can be used a devcontainer features",
55
"keywords": [
66
"dev",

‎src/gitutils/_git-release-beta.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ if [ -f .git/RELEASE ] && [ -n "$(git branch --list release/* | grep -v $(cat .g
1010
fi
1111

1212
#### GET BUMP VERSION
13-
GBV=$(gitversion -config .gitversion -showvariable MajorMinorPatch | tee .git/RELEASE)
13+
GBV=$(gv -showvariable MajorMinorPatch | tee .git/RELEASE)
1414

1515
#### PREVENT GIT EDITOR PROMPT
1616
GIT_EDITOR=:

‎src/gitutils/_git-release-hotfix.sh‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,23 @@
33
#### Goto repository root
44
cd "$(git rev-parse --show-toplevel)" >/dev/null
55

6-
#### GET last vX.Y.Z tag on the main branch
7-
last=$(git describe --tags --abbrev=0 --match "v[0-9]*.[0-9]*.[0-9]*" main | sed 's/^v//')
6+
# Parse arguments and print help if needed
7+
eval $(
8+
zz_args "Create HotFix branch" $0 "$@" <<-help
9+
help
10+
)
11+
12+
#### GET last vX.Y.Z tag on the main branch, removing the leading 'v' and replacing last number with 'X'
13+
current=$(git describe --tags --abbrev=0 --match "v[0-9]*.[0-9]*.[0-9]*" main | sed -e 's/^v//' -e 's/\.[0-9]*$/.X/')
814

915
#### SAVE CURRENT STATUS
10-
git stash save --include-untracked "Before hotfix/$last"
16+
git stash --include-untracked --message "Before $current" --keep-index
1117

1218
#### PREVENT GIT EDITOR PROMPT
1319
GIT_EDITOR=:
1420

1521
#### START HOTFIX
16-
git flow hotfix start $last
22+
git flow hotfix start $current
1723

1824
#### RESTORE STATUS
1925
git stash apply

‎src/gitutils/_git-release-prod.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ fi
4444
zz_log s "On branch: {Blue $flow/$name}"
4545

4646
# Get the new version from gitversion
47-
GBV=$(gitversion -config .gitversion -showvariable MajorMinorPatch)
47+
GBV=$(gv -showvariable MajorMinorPatch)
4848
if [ -z "$GBV" ]; then
4949
zz_log e "Cannot get version from .gitversion"
5050
exit 1

‎src/gitutils/devcontainer-feature.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"id": "gitutils",
33
"name": "Git Aliases",
44
"description": "A feature to add useful Git aliases to your shell.",
5-
"version": "5.29.1-beta.1",
5+
"version": "5.30.0-beta.1",
66
"dependsOn": {
77
"ghcr.io/devcontainers/features/node:1": "lts",
88
"ghcr.io/tomgrv/devcontainer-features/common-utils:5": {

‎src/gitutils/package.json‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,44 @@
11
{
2-
"name": "@tomgrv/gitutils",
3-
"version": "5.29.1-beta.1",
4-
"description": "Git utilities and aliases for development workflow",
5-
"files": [
6-
"_*.sh",
7-
"install.sh",
8-
"install-config.sh",
9-
"alias.json",
10-
"config.json",
11-
"stubs/**/*"
12-
],
13-
"bin": {
14-
"deleteChildren": "./_deleteChildren.sh",
15-
"git-align": "./_git-align.sh",
16-
"git-co": "./_git-co.sh",
17-
"git-degit": "./_git-degit.sh",
18-
"git-fix": "./_git-fix.sh",
19-
"git-fix-author": "./_git-fix-author.sh",
20-
"git-fix-emoji": "./_git-fix-emoji.sh",
21-
"git-fix-last": "./_git-fix-last.sh",
22-
"git-fix-lock": "./_git-fix-lock.sh",
23-
"git-fix-mode": "./_git-fix-mode.sh",
24-
"git-fix-privacy": "./_git-fix-privacy.sh",
25-
"git-fix-up": "./_git-fix-up.sh",
26-
"git-forall": "./_git-forall.sh",
27-
"git-getcommit": "./_git-getcommit.sh",
28-
"git-integrate": "./_git-integrate.sh",
29-
"git-pick": "./_git-pick.sh",
30-
"git-release": "./_git-release.sh",
31-
"git-release-alpha": "./_git-release-alpha.sh",
32-
"git-release-beta": "./_git-release-beta.sh",
33-
"git-release-hotfix": "./_git-release-hotfix.sh",
34-
"git-release-prod": "./_git-release-prod.sh",
35-
"setrights": "./_setrights.sh",
36-
"unset": "./_unset.sh"
37-
},
38-
"scripts": {},
39-
"dependencies": {},
40-
"peerDependencies": {
41-
"@tomgrv/common-utils": "^5.0.0",
42-
"@tomgrv/gitversion": "^5.0.0"
43-
}
2+
"name": "@tomgrv/gitutils",
3+
"version": "5.30.0-beta.1",
4+
"description": "Git utilities and aliases for development workflow",
5+
"files": [
6+
"_*.sh",
7+
"install.sh",
8+
"install-config.sh",
9+
"alias.json",
10+
"config.json",
11+
"stubs/**/*"
12+
],
13+
"bin": {
14+
"deleteChildren": "./_deleteChildren.sh",
15+
"git-align": "./_git-align.sh",
16+
"git-co": "./_git-co.sh",
17+
"git-degit": "./_git-degit.sh",
18+
"git-fix": "./_git-fix.sh",
19+
"git-fix-author": "./_git-fix-author.sh",
20+
"git-fix-emoji": "./_git-fix-emoji.sh",
21+
"git-fix-last": "./_git-fix-last.sh",
22+
"git-fix-lock": "./_git-fix-lock.sh",
23+
"git-fix-mode": "./_git-fix-mode.sh",
24+
"git-fix-privacy": "./_git-fix-privacy.sh",
25+
"git-fix-up": "./_git-fix-up.sh",
26+
"git-forall": "./_git-forall.sh",
27+
"git-getcommit": "./_git-getcommit.sh",
28+
"git-integrate": "./_git-integrate.sh",
29+
"git-pick": "./_git-pick.sh",
30+
"git-release": "./_git-release.sh",
31+
"git-release-alpha": "./_git-release-alpha.sh",
32+
"git-release-beta": "./_git-release-beta.sh",
33+
"git-release-hotfix": "./_git-release-hotfix.sh",
34+
"git-release-prod": "./_git-release-prod.sh",
35+
"setrights": "./_setrights.sh",
36+
"unset": "./_unset.sh"
37+
},
38+
"scripts": {},
39+
"dependencies": {},
40+
"peerDependencies": {
41+
"@tomgrv/common-utils": "^5.0.0",
42+
"@tomgrv/gitversion": "^5.0.0"
43+
}
4444
}

‎src/gitversion/_bump-changelog.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ if [ -n "$dry_run" ] || [ -z "$bump" ]; then
326326
fi
327327

328328
# Determine version and range using the bump-version script
329-
determined_version=$(bump-version $minimal ${bump_version_dry_run} "$version")
329+
determined_version=$(bump-version $minimal ${bump_version_dry_run} $version)
330330
version=$(echo "$determined_version" | awk '{print $2}')
331331
range=$(echo "$determined_version" | awk '{print $1}')
332332
if [ -n "$version" ] && [ -n "$range" ]; then

‎src/gitversion/_bump-version.sh‎

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ set -e
1212
# Parse command line arguments using zz_args helper
1313
eval $(
1414
zz_args "Bump version files utility" $0 "$@" <<- help
15-
- version version Version to set in files (optional - will use GitVersion if not provided)
1615
m minimal minimal Only bump workspace files if commit scope relates to workspace name
1716
r range range Git range to check for affected workspaces (required for minimal mode)
1817
d - dry_run Show what would be updated without making changes
18+
- version version Version to set in files (optional - will use GitVersion if not provided)
1919
help
2020
)
2121

@@ -24,23 +24,6 @@ cd "$(git rev-parse --show-toplevel)" > /dev/null
2424

2525
# ===== VERSION DETERMINATION FUNCTIONS =====
2626

27-
# Use GitVersion to determine the current semantic version
28-
# Returns the semantic version based on git history and conventional commits
29-
get_gitversion() {
30-
local gitversion_output
31-
if command -v dotnet-gitversion > /dev/null 2>&1; then
32-
gitversion_output=$(dotnet-gitversion -config .gitversion 2>/dev/null)
33-
if [ $? -eq 0 ]; then
34-
echo "$gitversion_output" | jq -r '.SemVer'
35-
return 0
36-
fi
37-
fi
38-
39-
# Fallback to basic version extraction if GitVersion fails
40-
zz_log w "GitVersion not available or failed, falling back to tag-based versioning"
41-
get_latest_tag | sed 's/^v//' || echo "0.1.0"
42-
}
43-
4427
# Get the latest semantic version tag from git history (fallback method)
4528
get_latest_tag() {
4629
git tag -l --sort=-version:refname | grep -E '^v?[0-9]+\.[0-9]+\.[0-9]+' | head -1
@@ -251,7 +234,7 @@ bump_version_files() {
251234

252235
# Determine version using GitVersion or user input
253236
if [ -z "$version" ]; then
254-
version=$(get_gitversion)
237+
version=$(gv -showvariable SemVer)
255238
zz_log s "GitVersion determined version: $version"
256239
else
257240
version=$(format_version "$version")

‎src/gitversion/_gv.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/bin/sh
22

33
# Call the GitVersion tool with the specified configuration
4-
/usr/local/bin/dotnet-gitversion -config ${1:-$(git rev-parse --show-toplevel)/.gitversion}
4+
/usr/local/bin/dotnet-gitversion -config ${1:-$(git rev-parse --show-toplevel)/.gitversion} $@

0 commit comments

Comments
 (0)