ci: update workflow

This reverts commit f0fc2c9.

Author: f-necas

.github/workflows/build-java11.yml

@@ -14,7 +14,7 @@ env:
 jobs:
   build:
     if: "!startsWith(github.event.head_commit.message, '[skip ci] ')"
-    name: "📦 Build and test GeoNetwork"
+    name: "📦 Build, test and publish on Docker Hub"
     runs-on: ubuntu-latest
     timeout-minutes: 40
     steps:
@@ -42,27 +42,15 @@ jobs:
         name: geonetwork.war
         path: web/target/geonetwork.war
 
-  build-docker:
-    needs: build
-    if: github.event_name != 'issue_comment' || needs.checks.outputs.shouldRun
-    name: "🐳 Build and upload docker images"
-    runs-on: ubuntu-latest
-    steps:
     - name: Getting image tag
       if: github.repository == 'georchestra/geonetwork' && github.actor != 'dependabot[bot]'
       id: version
       run: echo "VERSION=$(echo $GITHUB_REF | cut -d / -f 3)" >> $GITHUB_OUTPUT
 
-    - name: "Checking out"
-      uses: actions/checkout@v2.4.0
-      with:
-        submodules: 'recursive'
-
-    - name: "Build GeoNetwork docker image"
+    - name: "🐳 Build GeoNetwork docker image"
       if: github.repository == 'georchestra/geonetwork' && github.actor != 'dependabot[bot]'
       run: |
-        mvn -DskipTests -Pdatahub-integration clean install;
-        cd geonetwork/web
+        cd web
         mvn package -Pdocker,datahub-integration -DdockerImageName=georchestra/geonetwork -DdockerImageTags=${{ steps.version.outputs.VERSION }},latest -DskipTests -ntp
 
     - name: "Logging in docker.io"
@@ -78,12 +66,7 @@ jobs:
         docker push georchestra/geonetwork:latest
 
     - name: "Pushing release branch to docker.io"
-      if: contains(github.ref, 'refs/heads/24.') && github.repository == 'georchestra/geonetwork' && github.actor != 'dependabot[bot]' && github.event_name != 'pull_request'
-      run: |
-        docker push georchestra/geonetwork:${{ steps.version.outputs.VERSION }}
-
-    - name: "Pushing release tag to docker.io"
-      if: contains(github.ref, 'refs/tags/24.') && github.repository == 'georchestra/geonetwork' && github.actor != 'dependabot[bot]' && github.event_name != 'pull_request'
+      if: (contains(github.ref, 'refs/tags/') || endsWith(github.ref, '.x')) && github.repository == 'georchestra/geonetwork' && github.actor != 'dependabot[bot]' && github.event_name != 'pull_request'
       run: |
         docker push georchestra/geonetwork:${{ steps.version.outputs.VERSION }}