prepare code for PR

jhipster · Nov 22, 2023 · 08ee0dc · 08ee0dc
1 parent 8757718
commit 08ee0dc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/.github/workflows/publish-jvm-docker-image.yml b/.github/workflows/publish-jvm-docker-image.yml
@@ -2,7 +2,7 @@ name: Build and publish JVM-based images
 on:
   push:
     branches:
-      - graalvm
+      - main
     tags:
       - 'v*.*.*'
   pull_request:
@@ -39,6 +39,6 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          push: ${{ github.event_name != 'pull_request' }}
+          push: ${{ github.event_name == 'push' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/.github/workflows/publish-native-docker-image.yml b/.github/workflows/publish-native-docker-image.yml
@@ -2,7 +2,7 @@ name: Build and publish native (GraalVM) images
 on:
   push:
     branches:
-      - graalvm
+      - main
     tags:
       - 'v*.*.*'
   pull_request:
@@ -47,15 +47,13 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Tag the native (GraalVM) Docker image as "latest"
-        run: |
-          docker tag ${{ env.DOCKER_IMAGE_NAME }} ${{ env.DOCKER_IMAGE_NAME }}:latest
-
-      - name: Tag the native (GraalVM) Docker image with the current tag, if it exists
+      - name: Tag the native (GraalVM) Docker image
         if: ${{ startsWith(github.ref, 'refs/tags/v') }}
         run: |
+          docker tag ${{ env.DOCKER_IMAGE_NAME }} ${{ env.DOCKER_IMAGE_NAME }}:latest
           docker tag ${{ env.DOCKER_IMAGE_NAME }} ${{ env.DOCKER_IMAGE_NAME }}:${{  github.ref_name }}
 
       - name: Push the native (GraalVM) Docker image
+        if: ${{ github.event_name == 'push' }}
         run: |
           docker push --all-tags ${{ env.DOCKER_IMAGE_NAME }}