From 342754b49f1930a713c5b937a067b418263edec4 Mon Sep 17 00:00:00 2001
From: Roberto Cella <rob.uniud@gmail.com>
Date: Sun, 15 Oct 2023 17:37:54 +0200
Subject: [PATCH 1/3] fix docker workflow to run also on merged pull requests

---
 .github/workflows/docker-image.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 3f85517..b6d905d 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -3,6 +3,10 @@ name: Docker Image CI
 on:
   workflow_dispatch:
   pull_request:
+    types:
+      - opened
+      - reopened
+      - closed
   push:
     branches:
       - master
@@ -32,7 +36,7 @@ jobs:
             rob93c/christmas-greeter
           tags: |
             type=raw,value=latest,enable={{is_default_branch}}
-            type=ref,event=branch,enable=${{ github.ref != 'refs/heads/master' }}
+            type=ref,event=branch,enable=${{ endsWith(github.ref, 'master') }}
             type=ref,event=pr
 
       - name: Upload Docker image

From 934d0ea9cfca83c5340f09477b4c85adc4ad3f85 Mon Sep 17 00:00:00 2001
From: Roberto Cella <rob.uniud@gmail.com>
Date: Sun, 15 Oct 2023 17:42:58 +0200
Subject: [PATCH 2/3] fix endswith condition to check branch name

---
 .github/workflows/docker-image.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index b6d905d..ce121f2 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -36,7 +36,7 @@ jobs:
             rob93c/christmas-greeter
           tags: |
             type=raw,value=latest,enable={{is_default_branch}}
-            type=ref,event=branch,enable=${{ endsWith(github.ref, 'master') }}
+            type=ref,event=branch,enable=${{ "!endsWith(github.ref, 'master')" }}
             type=ref,event=pr
 
       - name: Upload Docker image

From db8a83aef1670ec250920e3d5ff2559afd0ca648 Mon Sep 17 00:00:00 2001
From: Roberto Cella <rob.uniud@gmail.com>
Date: Sun, 15 Oct 2023 17:57:29 +0200
Subject: [PATCH 3/3] add synchronize trigger for pull request and improve tag
 condition

---
 .github/workflows/docker-image.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index ce121f2..d1d35ee 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -5,6 +5,7 @@ on:
   pull_request:
     types:
       - opened
+      - synchronize
       - reopened
       - closed
   push:
@@ -36,7 +37,7 @@ jobs:
             rob93c/christmas-greeter
           tags: |
             type=raw,value=latest,enable={{is_default_branch}}
-            type=ref,event=branch,enable=${{ "!endsWith(github.ref, 'master')" }}
+            type=ref,event=branch,enable=${{ github.ref != github.event.repository.default_branch }}
             type=ref,event=pr
 
       - name: Upload Docker image