From 9ffd15ddcea519239a1002e2816a7d9ee5d68562 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Fri, 7 Feb 2025 10:10:25 +0000
Subject: [PATCH] Explicitly build and publish docker for develop/livekit
 branch

We don't need the tarball artifact and we have already done a build
---
 .github/workflows/build.yaml   | 14 ++++++++++++++
 .github/workflows/publish.yaml |  7 -------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 36bda9baa..d2692a3ae 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -47,3 +47,17 @@ jobs:
                   version: '${{ github.sha }}'
                 }
             })
+  docker_for_develop:
+    # Build docker and publish docker for livekit branch after build completes
+    if: github.ref == 'refs/heads/livekit'
+    needs: build_element_call
+    permissions:
+      contents: write
+      packages: write
+    uses: ./.github/workflows/build-and-publish-docker.yaml
+    with:
+      artifact_run_id: ${{ github.run_id }}
+      docker_tags: |
+        type=sha,format=short,event=branch
+        type=raw,value=latest-ci
+        type=raw,value=latest-ci_{{date 'X' }}
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index 4afb9d72d..2922465a9 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -3,11 +3,6 @@ name: Build & publish images to the package registry for releases
 on:
   release:
     types: [published]
-  workflow_run:
-    workflows: ["Build"]
-    branches: [livekit]
-    types:
-      - completed
 
 env:
   REGISTRY: ghcr.io
@@ -68,5 +63,3 @@ jobs:
       docker_tags: |
         type=sha,format=short,event=branch
         type=semver,pattern=v{{version}}
-        type=raw,value=latest-ci,enable={{is_default_branch}}
-        type=raw,value=latest-ci_${{needs.publish_tarball.outputs.unix_time}},enable={{is_default_branch}}