workflow fixes

offtherailz · Mar 4, 2024 · 902535f · 902535f
1 parent 39e9019
commit 902535f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/.github/ISSUE_TEMPLATE/release_steps.md b/.github/ISSUE_TEMPLATE/release_steps.md
@@ -22,12 +22,11 @@ This steps have to be followed always when preparing a new release.
 **Only** if you need to create a new stable major release (YYYY.XX.00), you need to create a branch for it. Check the following:
 
 - [ ] Run the [`Cut Release Branch`](https://github.com/geosolutions-it/MapStore2/actions/workflows/cut_major_branch.yml) workflow on github.
-      With the following Parameters:
-
-        - [ ] Use workflow from branch `master`
-        - [ ] MapStore branch name to use: `YYYY.XX.xx`
-        - [ ] Version of *MapFish Print*, *GeoStore* and *HTTP-Proxy* accordingly to the [MapStore release calendar](https://github.com/geosolutions-it/MapStore2/wiki/MapStore-Release-Calendars)
-        - [ ] use the default value for the other parameters
+  With the following Parameters:
+  - [ ] Use workflow from branch `master`
+  - [ ] MapStore branch name to use: `YYYY.XX.xx`
+  - [ ] Version of *MapFish Print*, *GeoStore* and *HTTP-Proxy* accordingly to the [MapStore release calendar](https://github.com/geosolutions-it/MapStore2/wiki/MapStore-Release-Calendars)
+  - [ ] use the default value for the other parameters
 - [ ] Wait for the process to complete. At the end:
     - A Pull request will be created to the master
     - A new branch named `YYYY.XX.xx` with fixed versions

diff --git a/.github/workflows/cut_major_branch.yml b/.github/workflows/cut_major_branch.yml
@@ -69,7 +69,11 @@ jobs:
               mvn versions:use-dep-version -f $POM_FILE -Dincludes=$HTTP_PROXY_GROUP -DdepVersion=$HTTP_PROXY_VERSION -DforceVersion=true -DgenerateBackupPoms=false -DautoVersionSubmodules=true -Pprinting
           done
           echo $POM_FILES | xargs git add
-          git commit -m "Set versions of main dependencies to a stable version"
+          if ! git diff-index --quiet HEAD; then
+            git commit -m "Set versions of main dependencies to a stable version"
+          else
+            echo "::notice no version changes in dependencies to commit. Please make sure to make this version fixed later"  
+          fi
           git push --set-upstream origin "$BRANCH_NAME"
           echo "branch created"
           echo "creating bump changes"