Merge branch 'hotfix/v5.30.X'

tomgrv · tomgrv · commit b37f382282c2 · 2025-10-02T18:43:31.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,17 @@
 
 # Changelog
 
+## 5.30.2 (2025-10-02)
+
+_Commits from: v5.30.1..HEAD_
+
+### 📦 gitutils changes
+
+#### Bug Fixes
+
+- 🐛 improve error handling ([5ca79f0](https://github.com/tomgrv/devcontainer-features/commit/5ca79f09b8f5ee3dd14181d53b0b4e43beca9d88))
+- 🐛 rename script setrights ([b099626](https://github.com/tomgrv/devcontainer-features/commit/b0996265881bafc375748a29aaa24051d05298a9))
+
 ## 5.30.1-beta.1 (2025-10-02)
 
 _Commits from: v5.30.0..HEAD_
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tomgrv/devcontainer-features",
-  "version": "5.30.1-beta.1",
+  "version": "5.30.2",
   "description": "Configure dev environment with devcontainer, gitflow, gitversion, git aliases & hooks. Can be used a devcontainer features",
   "keywords": [
     "dev",
diff --git a/src/act/devcontainer-feature.json b/src/act/devcontainer-feature.json
@@ -2,7 +2,7 @@
   "id": "act",
   "name": "Nektos Act",
   "description": "A tool for running GitHub Actions locally",
-  "version": "5.28.1",
+  "version": "5.30.2",
   "dependsOn": {
     "ghcr.io/devcontainers/features/docker-in-docker": {},
     "ghcr.io/tomgrv/devcontainer-features/common-utils:5": {}
diff --git a/src/act/package.json b/src/act/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tomgrv/act",
-  "version": "5.28.1",
+  "version": "5.30.2",
   "description": "Nektos Act - GitHub Actions local runner integration",
   "files": [
     "_*.sh",
diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
@@ -2,7 +2,7 @@
   "id": "common-utils",
   "name": "Common Utils",
   "description": "Common utils for tomgrv/devcontainer-features",
-  "version": "5.28.1",
+  "version": "5.30.2",
   "dependsOn": {
     "ghcr.io/devcontainers/features/common-utils": {}
   },
diff --git a/src/common-utils/package.json b/src/common-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tomgrv/common-utils",
-  "version": "5.28.1",
+  "version": "5.30.2",
   "description": "Common utilities and helper scripts for devcontainer features",
   "files": [
     "_*.sh",
diff --git a/src/githooks/devcontainer-feature.json b/src/githooks/devcontainer-feature.json
@@ -2,7 +2,7 @@
     "id": "githooks",
     "name": "Git Hooks",
     "description": "A feature to add useful Git hooks to your project",
-    "version": "5.28.1",
+    "version": "5.30.2",
     "dependsOn": {
         "ghcr.io/devcontainers/features/node:1": "lts",
         "ghcr.io/tomgrv/devcontainer-features/gitutils:5": {}
diff --git a/src/githooks/package.json b/src/githooks/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@tomgrv/githooks",
-    "version": "5.28.1",
+    "version": "5.30.2",
     "description": "Git hooks and linting configuration for development workflow",
     "files": [
         "_*.sh",
diff --git a/src/gitutils/_git-fix-rights.sh b/src/gitutils/_git-fix-rights.sh
diff --git a/src/gitutils/_git-release-prod.sh b/src/gitutils/_git-release-prod.sh
@@ -78,7 +78,7 @@ if bump-changelog -f $GBV -b; then
         # Create git tag for the new version
         bump-tag $GBV
     else
-        git undo
+        git undo && git pf
         zz_log e "Cannot finish release. CHANGELOG & VERSION are not updated."
     fi
 else
diff --git a/src/gitutils/devcontainer-feature.json b/src/gitutils/devcontainer-feature.json
@@ -2,7 +2,7 @@
   "id": "gitutils",
   "name": "Git Aliases",
   "description": "A feature to add useful Git aliases to your shell.",
-  "version": "5.30.1-beta.1",
+  "version": "5.30.2",
   "dependsOn": {
     "ghcr.io/devcontainers/features/node:1": "lts",
     "ghcr.io/tomgrv/devcontainer-features/common-utils:5": {
diff --git a/src/gitutils/package.json b/src/gitutils/package.json
@@ -1,44 +1,44 @@
 {
-    "name": "@tomgrv/gitutils",
-    "version": "5.30.1-beta.1",
-    "description": "Git utilities and aliases for development workflow",
-    "files": [
-        "_*.sh",
-        "install.sh",
-        "install-config.sh",
-        "alias.json",
-        "config.json",
-        "stubs/**/*"
-    ],
-    "bin": {
-        "deleteChildren": "./_deleteChildren.sh",
-        "git-align": "./_git-align.sh",
-        "git-co": "./_git-co.sh",
-        "git-degit": "./_git-degit.sh",
-        "git-fix": "./_git-fix.sh",
-        "git-fix-author": "./_git-fix-author.sh",
-        "git-fix-emoji": "./_git-fix-emoji.sh",
-        "git-fix-last": "./_git-fix-last.sh",
-        "git-fix-lock": "./_git-fix-lock.sh",
-        "git-fix-mode": "./_git-fix-mode.sh",
-        "git-fix-privacy": "./_git-fix-privacy.sh",
-        "git-fix-up": "./_git-fix-up.sh",
-        "git-forall": "./_git-forall.sh",
-        "git-getcommit": "./_git-getcommit.sh",
-        "git-integrate": "./_git-integrate.sh",
-        "git-pick": "./_git-pick.sh",
-        "git-release": "./_git-release.sh",
-        "git-release-alpha": "./_git-release-alpha.sh",
-        "git-release-beta": "./_git-release-beta.sh",
-        "git-release-hotfix": "./_git-release-hotfix.sh",
-        "git-release-prod": "./_git-release-prod.sh",
-        "setrights": "./_setrights.sh",
-        "unset": "./_unset.sh"
-    },
-    "scripts": {},
-    "dependencies": {},
-    "peerDependencies": {
-        "@tomgrv/common-utils": "^5.0.0",
-        "@tomgrv/gitversion": "^5.0.0"
-    }
+  "name": "@tomgrv/gitutils",
+  "version": "5.30.2",
+  "description": "Git utilities and aliases for development workflow",
+  "files": [
+    "_*.sh",
+    "install.sh",
+    "install-config.sh",
+    "alias.json",
+    "config.json",
+    "stubs/**/*"
+  ],
+  "bin": {
+    "deleteChildren": "./_deleteChildren.sh",
+    "git-align": "./_git-align.sh",
+    "git-co": "./_git-co.sh",
+    "git-degit": "./_git-degit.sh",
+    "git-fix": "./_git-fix.sh",
+    "git-fix-author": "./_git-fix-author.sh",
+    "git-fix-emoji": "./_git-fix-emoji.sh",
+    "git-fix-last": "./_git-fix-last.sh",
+    "git-fix-lock": "./_git-fix-lock.sh",
+    "git-fix-mode": "./_git-fix-mode.sh",
+    "git-fix-privacy": "./_git-fix-privacy.sh",
+    "git-fix-up": "./_git-fix-up.sh",
+    "git-forall": "./_git-forall.sh",
+    "git-getcommit": "./_git-getcommit.sh",
+    "git-integrate": "./_git-integrate.sh",
+    "git-pick": "./_git-pick.sh",
+    "git-release": "./_git-release.sh",
+    "git-release-alpha": "./_git-release-alpha.sh",
+    "git-release-beta": "./_git-release-beta.sh",
+    "git-release-hotfix": "./_git-release-hotfix.sh",
+    "git-release-prod": "./_git-release-prod.sh",
+    "setrights": "./_setrights.sh",
+    "unset": "./_unset.sh"
+  },
+  "scripts": {},
+  "dependencies": {},
+  "peerDependencies": {
+    "@tomgrv/common-utils": "^5.0.0",
+    "@tomgrv/gitversion": "^5.0.0"
+  }
 }
diff --git a/src/gitversion/devcontainer-feature.json b/src/gitversion/devcontainer-feature.json
@@ -2,7 +2,7 @@
   "id": "gitversion",
   "name": "GitVersion feature",
   "description": "Add gitversion to your devcontainer",
-  "version": "5.30.0-beta.1",
+  "version": "5.30.2",
   "dependsOn": {
     "ghcr.io/devcontainers/features/dotnet": "",
     "ghcr.io/tomgrv/devcontainer-features/common-utils:5": ""
diff --git a/src/gitversion/package.json b/src/gitversion/package.json
@@ -1,24 +1,24 @@
 {
-    "name": "@tomgrv/gitversion",
-    "version": "5.30.0-beta.1",
-    "description": "GitVersion integration and version management scripts",
-    "files": [
-        "_*.sh",
-        "install.sh",
-        "install-tools.sh",
-        "_scripts.package.json",
-        "stubs/**/*"
-    ],
-    "bin": {
-        "bump-changelog": "./_bump-changelog.sh",
-        "bump-tag": "./_bump-tag.sh",
-        "bump-version": "./_bump-version.sh",
-        "checkout-version": "./_checkout-version.sh",
-        "gv": "./_gv.sh"
-    },
-    "scripts": {},
-    "dependencies": {},
-    "peerDependencies": {
-        "@tomgrv/common-utils": "^5.0.0"
-    }
+  "name": "@tomgrv/gitversion",
+  "version": "5.30.2",
+  "description": "GitVersion integration and version management scripts",
+  "files": [
+    "_*.sh",
+    "install.sh",
+    "install-tools.sh",
+    "_scripts.package.json",
+    "stubs/**/*"
+  ],
+  "bin": {
+    "bump-changelog": "./_bump-changelog.sh",
+    "bump-tag": "./_bump-tag.sh",
+    "bump-version": "./_bump-version.sh",
+    "checkout-version": "./_checkout-version.sh",
+    "gv": "./_gv.sh"
+  },
+  "scripts": {},
+  "dependencies": {},
+  "peerDependencies": {
+    "@tomgrv/common-utils": "^5.0.0"
+  }
 }
diff --git a/src/larasets/devcontainer-feature.json b/src/larasets/devcontainer-feature.json
@@ -2,7 +2,7 @@
   "id": "larasets",
   "name": "Laravel settings",
   "description": "A feature to add useful laravel settings to your shell.",
-  "version": "5.28.1",
+  "version": "5.30.2",
   "dependsOn": {
     "ghcr.io/devcontainers/features/docker-in-docker": "",
     "ghcr.io/devcontainers/features/node:1": "lts",
diff --git a/src/larasets/package.json b/src/larasets/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tomgrv/larasets",
-  "version": "5.28.1",
+  "version": "5.30.2",
   "description": "Laravel development settings and utilities",
   "files": [
     "_*.sh",
diff --git a/src/pecl/devcontainer-feature.json b/src/pecl/devcontainer-feature.json
@@ -2,7 +2,7 @@
   "id": "pecl",
   "name": "PECL Install feature",
   "description": "Add pecl",
-  "version": "5.28.1",
+  "version": "5.30.2",
   "dependsOn": {
     "ghcr.io/devcontainers/features/php:1": {
       "version": "8.2"
diff --git a/src/pecl/package.json b/src/pecl/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@tomgrv/pecl",
-    "version": "5.28.1",
+    "version": "5.30.2",
     "description": "PECL extension installer for PHP development",
     "files": [
         "install.sh"

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@tomgrv/devcontainer-features",`
`3`		`- "version": "5.30.1-beta.1",`
	`3`	`+ "version": "5.30.2",`
`4`	`4`	`"description": "Configure dev environment with devcontainer, gitflow, gitversion, git aliases & hooks. Can be used a devcontainer features",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"dev",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@tomgrv/act",`
`3`		`- "version": "5.28.1",`
	`3`	`+ "version": "5.30.2",`
`4`	`4`	`"description": "Nektos Act - GitHub Actions local runner integration",`
`5`	`5`	`"files": [`
`6`	`6`	`"_*.sh",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@tomgrv/common-utils",`
`3`		`- "version": "5.28.1",`
	`3`	`+ "version": "5.30.2",`
`4`	`4`	`"description": "Common utilities and helper scripts for devcontainer features",`
`5`	`5`	`"files": [`
`6`	`6`	`"_*.sh",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@tomgrv/githooks",`
`3`		`- "version": "5.28.1",`
	`3`	`+ "version": "5.30.2",`
`4`	`4`	`"description": "Git hooks and linting configuration for development workflow",`
`5`	`5`	`"files": [`
`6`	`6`	`"_*.sh",`