Fix PR actions

mjanez · Sep 15, 2023 · 0315a3c · 0315a3c
1 parent 1413ffb
commit 0315a3c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/docker-dev.yaml b/.github/workflows/docker-dev.yaml
@@ -3,11 +3,11 @@ name: Build ckan-pycsw-dev images
 on:
   push:
     branches:
-      - main
       - latest
   pull_request:
     branches:
       - main
+      - latest
 
 env:
   REGISTRY: ghcr.io
@@ -84,7 +84,7 @@ jobs:
   docker-push:
     name: runner/build-docker-push
     runs-on: ubuntu-latest
-    if: github.event_name != 'pull_request'
+    if: github.event_name == 'push' && github.ref == 'refs/heads/main' || github.ref == 'refs/heads/latest'
     steps:
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -124,7 +124,7 @@ jobs:
         id: get-build-name
         run: echo "image_name=${{ fromJSON(steps.docker-push.outputs.metadata)['image.name'] }}" >> $GITHUB_ENV
 
-      - name: Linting Dockerfile with hadolint
+      - name: Linting Dockerfile with hadolint in GH Actions
         id: hadolint
         uses: hadolint/hadolint-action@v3.1.0
         with:

diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
@@ -3,11 +3,11 @@ name: Build ckan-pycsw images
 on:
   push:
     branches:
-      - main
       - latest
   pull_request:
     branches:
       - main
+      - latest
 
 env:
   REGISTRY: ghcr.io
@@ -84,7 +84,7 @@ jobs:
   docker-push:
     name: runner/build-docker-push
     runs-on: ubuntu-latest
-    if: github.event_name != 'pull_request'
+    if: github.event_name == 'push' && github.ref == 'refs/heads/main' || github.ref == 'refs/heads/latest'
     steps:
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -124,7 +124,7 @@ jobs:
         id: get-build-name
         run: echo "image_name=${{ fromJSON(steps.docker-push.outputs.metadata)['image.name'] }}" >> $GITHUB_ENV
 
-      - name: Linting Dockerfile with hadolint
+      - name: Linting Dockerfile with hadolint in GH Actions
         id: hadolint
         uses: hadolint/hadolint-action@v3.1.0
         with: