Merge branch 'devel-1.0' into devel-2.0

EnricoMi · Jul 4, 2022 · 572e489 · 572e489
2 parents 1a97350 + 3597e51
commit 572e489
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
@@ -636,7 +636,7 @@ jobs:
           push: |
             ${{
               github.event_name == 'push' && (
-                needs.config-deploy.outputs.image != 'Dockerfile' && needs.config-deploy.outputs.image-exists != 'true' && github.ref == 'refs/heads/master' ||
+                needs.config-deploy.outputs.image != 'Dockerfile' && startsWith(github.ref, 'refs/heads/master') && needs.config-deploy.outputs.image-exists != 'true' ||
                 needs.config-deploy.outputs.image == 'Dockerfile' && startsWith(github.ref, 'refs/tags/v') && contains(github.ref, '.')
               )
             }}