From 107ff80410eb6f185096fb8149c868160abdeaf6 Mon Sep 17 00:00:00 2001
From: j4n <j4n@systemli.org>
Date: Tue, 24 Feb 2026 13:50:39 +0100
Subject: [PATCH] docker/ci: don't run the regular deploys for the
 j4n/docker-pr branch

---
 .github/workflows/docker-ci.yaml                | 16 ++++++++--------
 .github/workflows/test-and-deploy-ipv4only.yaml |  1 +
 .github/workflows/test-and-deploy.yaml          |  1 +
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/docker-ci.yaml b/.github/workflows/docker-ci.yaml
index 661058a8..7e3803de 100644
--- a/.github/workflows/docker-ci.yaml
+++ b/.github/workflows/docker-ci.yaml
@@ -85,7 +85,7 @@ jobs:
           echo "image=${IMAGE}" >> "$GITHUB_OUTPUT"
 
   deploy:
-    name: Deploy to ${{ matrix.host }}
+    name: Deploy docker image to ${{ matrix.host }}
     needs: build
     if: github.event_name == 'push'
     runs-on: ubuntu-latest
@@ -100,12 +100,12 @@ jobs:
             zone_file: staging.testrun.org-default.zone
             disable_ipv6: false
             add_ssh_keys: true
-          - host: staging-ipv4.testrun.org
-            acme_dir: acme-ipv4
-            dkim_dir: dkimkeys-ipv4
-            zone_file: staging-ipv4.testrun.org-default.zone
-            disable_ipv6: true
-            add_ssh_keys: false
+#          - host: staging-ipv4.testrun.org
+#            acme_dir: acme-ipv4
+#            dkim_dir: dkimkeys-ipv4
+#            zone_file: staging-ipv4.testrun.org-default.zone
+#            disable_ipv6: true
+#            add_ssh_keys: false
     environment:
       name: ${{ matrix.host }}
       url: https://${{ matrix.host }}/
@@ -229,7 +229,7 @@ jobs:
           ssh root@${HOST} 'cd /srv/chatmail/relay && docker compose logs --tail=200'
           exit 1
 
-      - name: add hpk42 key to staging server
+      - name: add ssh keys to staging server
         if: matrix.add_ssh_keys
         run: ssh root@${{ matrix.host }} 'curl -s https://github.com/hpk42.keys https://github.com/j4n.keys >> .ssh/authorized_keys'
 
diff --git a/.github/workflows/test-and-deploy-ipv4only.yaml b/.github/workflows/test-and-deploy-ipv4only.yaml
index 990963ec..f8e4c510 100644
--- a/.github/workflows/test-and-deploy-ipv4only.yaml
+++ b/.github/workflows/test-and-deploy-ipv4only.yaml
@@ -14,6 +14,7 @@ on:
 jobs:
   deploy:
     name: deploy on staging-ipv4.testrun.org, and run tests
+    if: ${{ !startsWith(github.head_ref, 'j4n/') }}
     runs-on: ubuntu-latest
     timeout-minutes: 30
     environment:
diff --git a/.github/workflows/test-and-deploy.yaml b/.github/workflows/test-and-deploy.yaml
index 2f744cb8..b2c4b1bf 100644
--- a/.github/workflows/test-and-deploy.yaml
+++ b/.github/workflows/test-and-deploy.yaml
@@ -14,6 +14,7 @@ on:
 jobs:
   deploy:
     name: deploy on staging2.testrun.org, and run tests
+    if: ${{ !startsWith(github.head_ref, 'j4n/') }}
     runs-on: ubuntu-latest
     timeout-minutes: 30
     environment: