Merge pull request #4158 from rouault/fix_4156

docker.yml: re-instate pushing Docker 'proj' image for non-master builds
OSGeo · Jun 3, 2024 · 64bef2b · 64bef2b
2 parents 929f946 + 5083bad
commit 64bef2b
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -33,7 +33,8 @@ jobs:
           - container: "proj-docs"
             dockerfile: "./Dockerfile"
     env:
-      PUSH_PACKAGES: ${{ github.repository_owner == 'OSGeo' && github.ref_name == 'master' && github.event_name == 'push' }}
+      # Only push proj-docs package for master
+      PUSH_PACKAGES: ${{ github.repository_owner == 'OSGeo' && github.event_name != 'pull_request' && (matrix.container == 'proj' || (matrix.container == 'proj-docs' && github.ref_name == 'master')) }}
       CONTAINER: ${{ matrix.container }}
     steps:
       - uses: actions/checkout@v4