Merge pull request #9856 from camptocamp/backport/9854-to-2.7

[Backport 2.7] Fix the publish from ngeo

Author: sbrunner

.github/workflows/main.yaml

@@ -55,9 +55,6 @@ jobs:
       - name: Checks
         run: c2cciutils-checks
 
-      - run: scripts/get-version --auto-increment --github
-        id: version
-
       - run: python3 -m pip install --user --requirement=requirements.txt
 
       # Build images
@@ -161,6 +158,13 @@ jobs:
         if: failure()
         continue-on-error: True
 
+      - run: git pull --ff-only origin ${{ env.MAIN_BRANCH }}
+        if: >
+          github.ref == format('refs/heads/{0}', env.MAIN_BRANCH)
+          && env.HAS_SECRETS == 'HAS_SECRETS'
+      - run: scripts/get-version --auto-increment --github
+        id: version
+
       # Test Upgrade
       - run: DOCKER_TAG=${{ steps.version.outputs.full }} make build-tools
       - run: DOCKER_TAG=${{ steps.version.outputs.full }} make build-runner
@@ -182,12 +186,24 @@ jobs:
       - run: ci/create-new-project ${HOME}/workspace geomapfishapp
       - run: (cd ${HOME}/workspace/geomapfishapp/; ./build)
 
-      - name: 'Update the changelog'
+      - name: Update the changelog
         run: ci/changelog ${{ steps.version.outputs.full }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - run: git diff CHANGELOG.md
 
+      - name: Push version and changelog
+        run: |
+          set -eux
+          git add ci/ci.yaml ci/changelog.yaml CHANGELOG.md
+          git diff --staged --quiet || (\
+            git commit -m "[skip ci] Update the minor version"; \
+            git push origin HEAD:${{ env.MAIN_BRANCH }} \
+          )
+        if: >
+          github.ref == format('refs/heads/{0}', env.MAIN_BRANCH)
+          && env.HAS_SECRETS == 'HAS_SECRETS'
+
       - name: Publish feature branch
         run: |
           c2cciutils-publish
@@ -204,18 +220,6 @@ jobs:
           github.ref == format('refs/heads/{0}', env.MAIN_BRANCH)
           && env.HAS_SECRETS == 'HAS_SECRETS'
 
-      - name: Push version and changelog
-        run: |
-          set -eux
-          git add ci/ci.yaml ci/changelog.yaml CHANGELOG.md
-          git diff --staged --quiet || (\
-            git commit -m "[skip ci] Update the minor version"; \
-            git push origin HEAD:${{ env.MAIN_BRANCH }} \
-          )
-        if: >
-          github.ref == format('refs/heads/{0}', env.MAIN_BRANCH)
-          && env.HAS_SECRETS == 'HAS_SECRETS'
-
       - name: Notify demo
         run: >
           curl --request POST --header "Content-Type: application/json"

.github/workflows/ngeo-25.yaml

@@ -132,6 +132,10 @@ jobs:
       # Test App
       - run: ci/test-app
 
+      - run: git pull --ff-only origin ${{ env.MAIN_BRANCH }}
+      - run: scripts/get-version --auto-increment --github
+        id: version
+
       # Test Upgrade
       - run: DOCKER_TAG=${{ steps.version.outputs.full }} make build-tools
       - run: DOCKER_TAG=${{ steps.version.outputs.full }} make build-runner
@@ -175,6 +179,11 @@ jobs:
               HEAD:${{ env.MAIN_BRANCH }}
           )
 
+      - name: Publish version branch
+        run: |
+          c2cciutils-publish --type=version_branch --version=${{ steps.version.outputs.major }}
+          c2cciutils-publish --group=full --type=version_branch --version=${{ steps.version.outputs.full }}
+
       - name: Notify demo
         run: >
           curl --request POST --header "Content-Type: application/json"

.github/workflows/ngeo-26.yaml

@@ -39,9 +39,6 @@ jobs:
       - name: Checks
         run: c2cciutils-checks
 
-      - run: scripts/get-version --force-increment --github
-        id: version
-
       - run: python3 -m pip install --user --requirement=requirements.txt
 
       # Global simple lint
@@ -144,6 +141,10 @@ jobs:
         if: failure()
         continue-on-error: True
 
+      - run: git pull --ff-only origin ${{ env.MAIN_BRANCH }}
+      - run: scripts/get-version --force-increment --github
+        id: version
+
       # Test Upgrade
       - run: DOCKER_TAG=${{ steps.version.outputs.full }} make build-tools
       - run: DOCKER_TAG=${{ steps.version.outputs.full }} make build-runner
@@ -165,21 +166,12 @@ jobs:
       - run: ci/create-new-project ${HOME}/workspace geomapfishapp
       - run: (cd ${HOME}/workspace/geomapfishapp/; ./build)
 
-      - name: 'Update the changelog'
+      - name: Update the changelog
         run: ci/changelog ${{ steps.version.outputs.full }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - run: git diff CHANGELOG.md
 
-      - name: Publish feature branch
-        run: |
-          c2cciutils-publish
-          c2cciutils-publish --group=full
-      - name: Publish version branch
-        run: |
-          c2cciutils-publish --type=version_branch --version=${{ steps.version.outputs.major }}
-          c2cciutils-publish --group=full --type=version_branch --version=${{ steps.version.outputs.full }}
-
       - name: Push version and changelog
         run: |
           set -eux
@@ -189,6 +181,11 @@ jobs:
             git push origin HEAD:${{ env.MAIN_BRANCH }} \
           )
 
+      - name: Publish version branch
+        run: |
+          c2cciutils-publish --type=version_branch --version=${{ steps.version.outputs.major }}
+          c2cciutils-publish --group=full --type=version_branch --version=${{ steps.version.outputs.full }}
+
       - name: Notify demo
         run: >
           curl --request POST --header "Content-Type: application/json"

doc/developer/build_release.rst

@@ -138,7 +138,7 @@ On ``c2cgeoportal`` copy the file ``.github/workflows/main.yaml`` from new versi
    -   - name: Publish version branch
    -     ...
 
-   -       - name: 'Update the changelog'
+   -       - name: Update the changelog
    -         ...
    -       - run: git diff CHANGELOG.md
 
@@ -228,6 +228,9 @@ On ``c2cgeoportal`` copy the file ``.github/workflows/main.yaml`` from new versi
    +         with:
    +          ref: ${{ env.MAIN_BRANCH }}
 
+   -       - name: Publish feature branch
+   -         ...
+   -
    -       - name: Publish to Transifex
    -         ...
    -