Merge branch 'hotfix/v5.31.X'

Author: tomgrv

CHANGELOG.md

@@ -2,6 +2,17 @@
 
 # Changelog
 
+## 5.31.2 (2025-10-09)
+
+_Commits from: v5.31.1..HEAD_
+
+### 📂 Unscoped changes
+
+#### Bug Fixes
+
+- 🐛 file naming ([6e8fbc4](https://github.com/tomgrv/devcontainer-features/commit/6e8fbc4629a5fd577f3ac5455ab2ee3cdef7bdde))
+- 🐛 reorder flow branch checks for clarity ([277938b](https://github.com/tomgrv/devcontainer-features/commit/277938bb0e9d785f5ad132d955b1671f8f79c137))
+
 ## 5.31.1 (2025-10-09)
 
 _Commits from: v5.30.2..HEAD_

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@tomgrv/devcontainer-features",
-  "version": "5.31.1",
+  "version": "5.31.2",
   "description": "Configure dev environment with devcontainer, gitflow, gitversion, git aliases & hooks. Can be used a devcontainer features",
   "keywords": [
     "dev",

package.json

@@ -14,19 +14,17 @@ if [ -n "$(git branch --list hotfix/*)" ]; then
     flow=hotfix
     name=$(git branch --list hotfix/* | sed 's/.*hotfix\///'| head -n1 )
     zz_log i "Hotfix branch found: {Yellow $name}"
-fi
 
-# Check if on a release branch and extract branch name
-if [ -n "$(git branch --list release/*)" ]; then
+# Check for .git/RELEASE file if no flow branch found
+elif [ -z "$flow" ] && [ -f .git/RELEASE ]; then
     flow=release
-    name=$(git branch --list release/* | sed 's/.*release\///' | head -n1 )
+    name=$(cat .git/RELEASE)
     zz_log i "Release branch found: {Blue $name}"
-fi
 
-# Check if a flow branch is found from .git/RELEASE file
-if [ -z "$flow" ] && [ -f .git/RELEASE ]; then
+# Check if on a release branch and extract branch name
+elif [ -n "$(git branch --list release/*)" ]; then
     flow=release
-    name=$(cat .git/RELEASE)
+    name=$(git branch --list release/* | sed 's/.*release\///' | head -n1 )
     zz_log i "Release branch found: {Blue $name}"
 fi
 

src/gitutils/_git-release-prod.sh

@@ -2,7 +2,7 @@
   "id": "gitutils",
   "name": "Git Aliases",
   "description": "A feature to add useful Git aliases to your shell.",
-  "version": "5.31.1",
+  "version": "5.31.2",
   "dependsOn": {
     "ghcr.io/devcontainers/features/node:1": "lts",
     "ghcr.io/tomgrv/devcontainer-features/common-utils:5": {

src/gitutils/devcontainer-feature.json

@@ -1,6 +1,6 @@
 {
   "name": "@tomgrv/gitutils",
-  "version": "5.31.1",
+  "version": "5.31.2",
   "description": "Git utilities and aliases for development workflow",
   "files": [
     "_*.sh",

src/gitutils/package.json

@@ -2,7 +2,7 @@
   "id": "larasets",
   "name": "Laravel settings",
   "description": "A feature to add useful laravel settings to your shell.",
-  "version": "5.31.1",
+  "version": "5.31.2",
   "dependsOn": {
     "ghcr.io/devcontainers/features/docker-in-docker": "",
     "ghcr.io/devcontainers/features/node:1": "lts",

…ils/stubs/.github/workflow/rebase-pr.yml …ls/stubs/.github/workflows/rebase-pr.ymlsrc/gitutils/stubs/.github/workflow/rebase-pr.yml renamed to src/gitutils/stubs/.github/workflows/rebase-pr.yml src/gitutils/stubs/.github/workflow/rebase-pr.yml renamed to src/gitutils/stubs/.github/workflows/rebase-pr.yml

@@ -1,6 +1,6 @@
 {
     "name": "@tomgrv/larasets",
-    "version": "5.31.1",
+    "version": "5.31.2",
     "description": "Laravel development settings and utilities",
     "files": [
         "_*.sh",

src/larasets/devcontainer-feature.json

@@ -14,7 +14,7 @@ env:
   NODE_ENV: test
 
 jobs:
-  validate-code:
+  validate-php-code:
     runs-on: ubuntu-latest
     strategy:
       matrix: