Update maven.yml

Author: varunratnakar

.github/workflows/maven.yml

@@ -17,6 +17,10 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
+    - name: Get branch name
+      id: branch-name
+      uses: tj-actions/branch-names@v6
+      
     - name: Set up JDK 8
       uses: actions/setup-java@v2
       with:
@@ -36,47 +40,39 @@ jobs:
         name: Package
         path: staging
 
-  build_image:
-    needs: [build]
-    runs-on: ubuntu-latest
-    if: github.event_name == 'push'
-    steps:
-      - name: Get branch name
-        id: branch-name
-        uses: tj-actions/branch-names@v6
+    - name: Create environment variable with the commit id
+      run: |
+        echo "DOCKER_TAG=${GITHUB_SHA}" >> $GITHUB_ENV
 
-      - uses: actions/checkout@v2
-
-      - name: Create environment variable with the commit id
-        run: |
-          echo "DOCKER_TAG=${GITHUB_SHA}" >> $GITHUB_ENV
-      - name: Create environment variable with the version id
-        run: |
-          VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
-          [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
-          [ "$VERSION" == "master" ] && VERSION=latest
-           echo "WINGS_VERSION=${VERSION}" >> $GITHUB_ENV
-      - name: Expose the commit id
-        id: exposeValue
-        run: |
-          echo "::set-output name=docker_tag::${{ env.DOCKER_TAG }}"
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+    - name: Create environment variable with the version id
+      run: |
+        VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
+        [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
+        [ "$VERSION" == "master" ] && VERSION=latest
+         echo "WINGS_VERSION=${VERSION}" >> $GITHUB_ENV
+    
+    - name: Expose the commit id
+      id: exposeValue
+      run: |
+        echo "::set-output name=docker_tag::${{ env.DOCKER_TAG }}"
+    
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v2
 
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+    - name: Login to DockerHub
+      uses: docker/login-action@v1
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v3.0.0
-        with:
-          push: true
-          context: .
-          tags: ${{ env.DOCKER_IMAGE_REPOSITORY }}/${{ env.DOCKER_IMAGE_NAME }}:latest, ${{ env.DOCKER_IMAGE_REPOSITORY }}/${{ env.DOCKER_IMAGE_NAME }}:${{ env.DOCKER_TAG }}, ${{ env.DOCKER_IMAGE_REPOSITORY }}/${{ env.DOCKER_IMAGE_NAME }}:${{ env.WINGS_VERSION }}
-          file: ${{ env.DOCKER_FILE}}
-          platforms: linux/amd64,linux/arm64
+    - name: Build and push Docker image
+      uses: docker/build-push-action@v3.0.0
+      with:
+        push: true
+        context: .
+        tags: ${{ env.DOCKER_IMAGE_REPOSITORY }}/${{ env.DOCKER_IMAGE_NAME }}:latest, ${{ env.DOCKER_IMAGE_REPOSITORY }}/${{ env.DOCKER_IMAGE_NAME }}:${{ env.DOCKER_TAG }}, ${{ env.DOCKER_IMAGE_REPOSITORY }}/${{ env.DOCKER_IMAGE_NAME }}:${{ env.WINGS_VERSION }}
+        file: ${{ env.DOCKER_FILE}}
+        platforms: linux/amd64,linux/arm64