Handle hotfixes

.github/workflows/hotfix.yml

@@ -0,0 +1,32 @@
+name: Hotfix
+
+on:
+  workflow_dispatch:
+    inputs:
+      tag_version:
+        description: 'Tag version'
+        required: true
+
+jobs:
+  create-branch:
+    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/main'
+    steps:
+      - name: Checkout project
+        uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.CI_CD_TOKEN }}
+
+      - name: Create hotfix branch
+        run: |
+          START_TAG=v${{ github.event.inputs.tag_version }}
+          echo "Start from tag $START_TAG"
+          MAJOR_MINOR_DIGIT=$(echo "$START_TAG" | cut -d '.' -f 1-2)
+          PATCH_DIGIT=$(echo "$START_TAG" | cut -d '.' -f 3)
+          NEW_PATCH_DIGIT=$((PATCH_DIGIT + 1))
+          HOTFIX_VERSION="${MAJOR_MINOR_DIGIT}.${NEW_PATCH_DIGIT}"
+          HOTFIX_BRANCH_NAME="hotfix/$HOTFIX_VERSION"
+          echo "Create hotfix branch $HOTFIX_BRANCH_NAME"
+          git fetch --all
+          git checkout tags/$START_TAG -b $HOTFIX_BRANCH_NAME
+          git push origin $HOTFIX_BRANCH_NAME

.github/workflows/pull_request.yml

@@ -2,7 +2,9 @@ name: Pull request
 
 on:
   pull_request:
-    branches: [ master ]
+    branches:
+      - 'master'
+      - 'hotfix/v*.*.*'
 
 jobs:
   back-end:
@@ -20,7 +22,7 @@ jobs:
           distribution: 'temurin'
           cache: maven
 
-      - name: Check Style
+      - name: Check style
         run: mvn checkstyle:check
 
       - name: Build

.github/workflows/continuous_integration.yml → .github/workflows/push_master.yml

@@ -1,8 +1,9 @@
-name: Continuous integration
+name: Push Master
 
 on:
   push:
-    branches: [ master ]
+    branches:
+      - 'master'
 
 jobs:
   back-end:
@@ -20,7 +21,7 @@ jobs:
           distribution: 'temurin'
           cache: maven
 
-      - name: Check Style
+      - name: Check style
         run: mvn checkstyle:check
 
       - name: Build

.github/workflows/release.yml

@@ -11,6 +11,8 @@ jobs:
     steps:
       - name: Checkout project
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Set up JDK 21
         uses: actions/setup-java@v4
@@ -20,7 +22,14 @@ jobs:
           cache: maven
 
       - name: Docker
-        run: mvn clean package -P production jib:build -Djib.to.auth.username=$DOCKER_USER -Djib.to.auth.password=$DOCKER_TOKEN
+        run: |
+          CURRENT_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+          LATEST_VERSION=$(git tag -l --sort=-version:refname | head -1 | cut -d 'v' -f 2)
+          if [ "$LATEST_VERSION" == "$CURRENT_VERSION" ]; then
+            mvn clean package -P production jib:build -Djib.to.auth.username=$DOCKER_USER -Djib.to.auth.password=$DOCKER_TOKEN -Djib.to.tags=latest
+          else
+            mvn clean package -P production jib:build -Djib.to.auth.username=$DOCKER_USER -Djib.to.auth.password=$DOCKER_TOKEN
+          fi
         env:
           DOCKER_USER: ${{ secrets.DOCKER_USER }}
           DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }}

.github/workflows/tag.yml

@@ -10,7 +10,7 @@ on:
 jobs:
   tag:
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/hotfix/v')
     steps:
       - name: Checkout project
         uses: actions/checkout@v4

CONTRIBUTING.md

@@ -39,7 +39,7 @@ an Issue to discuss your proposal first. This is not required but can save time
 
 In general, we follow the ["fork-and-pull" Git workflow](https://github.com/susam/gitpr)
 
-- Fork the repository to your own Github account
+- Fork the repository to your own GitHub account
 - Clone the project to your machine
 - Create a branch locally from master with a succinct but descriptive name
 - Commit changes to the branch

pom.xml

@@ -346,10 +346,6 @@
                     </from>
                     <to>
                         <image>docker.io/michelin/${project.artifactId}:${project.version}</image>
-                        <tags>
-                            <tag>${project.version}</tag>
-                            <tag>latest</tag>
-                        </tags>
                     </to>
                 </configuration>
             </plugin>