From 84ca3de6161d3549fa28c57e9e02399506e5abb0 Mon Sep 17 00:00:00 2001
From: Aditya <60684641+0x0elliot@users.noreply.github.com>
Date: Wed, 13 May 2026 03:56:53 +0530
Subject: [PATCH] ci: deduplicate sync-orborus into reusable workflow

---
 .github/workflows/dockerbuild-nightly.yaml    | 35 ++----------------
 .github/workflows/dockerbuild.yaml            | 35 ++----------------
 .github/workflows/sync-orborus.yaml           |  7 +++-
 .github/workflows/tagged-nightly-release.yaml | 37 ++-----------------
 4 files changed, 18 insertions(+), 96 deletions(-)

diff --git a/.github/workflows/dockerbuild-nightly.yaml b/.github/workflows/dockerbuild-nightly.yaml
index 4e8c11d3..559f24ff 100644
--- a/.github/workflows/dockerbuild-nightly.yaml
+++ b/.github/workflows/dockerbuild-nightly.yaml
@@ -2,11 +2,6 @@ name: nightly-dockerbuild
 
 on:
   workflow_dispatch:
-    inputs:
-      orborus_version:
-        description: "Orborus version to sync (default: nightly)"
-        required: false
-        default: "nightly"
   push:
     branches:
       - nightly
@@ -83,29 +78,7 @@ jobs:
         run: echo ${{ steps.docker_build.outputs.digest }}
 
   sync-orborus:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        version: ["${{ github.event.inputs.orborus_version || 'nightly' }}"]
-    steps:
-      - name: Login to DockerHub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Login to Ghcr
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Pull, retag and push orborus
-        run: |
-          docker pull ghcr.io/shuffle/orborus:${{ matrix.version }}
-          docker tag ghcr.io/shuffle/orborus:${{ matrix.version }} ghcr.io/shuffle/shuffle-orborus:${{ matrix.version }}
-          docker tag ghcr.io/shuffle/orborus:${{ matrix.version }} ${{ secrets.DOCKERHUB_USERNAME }}/shuffle-orborus:${{ matrix.version }}
-          docker push ghcr.io/shuffle/shuffle-orborus:${{ matrix.version }}
-          docker push ${{ secrets.DOCKERHUB_USERNAME }}/shuffle-orborus:${{ matrix.version }}
+    uses: ./.github/workflows/sync-orborus.yaml
+    secrets: inherit
+    with:
+      orborus_version: nightly
diff --git a/.github/workflows/dockerbuild.yaml b/.github/workflows/dockerbuild.yaml
index 1f429f03..c202cbef 100644
--- a/.github/workflows/dockerbuild.yaml
+++ b/.github/workflows/dockerbuild.yaml
@@ -2,11 +2,6 @@ name: dockerbuild
 
 on:
   workflow_dispatch:
-    inputs:
-      orborus_version:
-        description: "Orborus version to sync (default: latest)"
-        required: false
-        default: "latest"
   push:
     branches:
       - main
@@ -77,29 +72,7 @@ jobs:
         run: echo ${{ steps.docker_build.outputs.digest }}
 
   sync-orborus:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        version: ["${{ github.event.inputs.orborus_version || 'latest' }}"]
-    steps:
-      - name: Login to DockerHub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Login to Ghcr
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Pull, retag and push orborus
-        run: |
-          docker pull ghcr.io/shuffle/orborus:${{ matrix.version }}
-          docker tag ghcr.io/shuffle/orborus:${{ matrix.version }} ghcr.io/shuffle/shuffle-orborus:${{ matrix.version }}
-          docker tag ghcr.io/shuffle/orborus:${{ matrix.version }} ${{ secrets.DOCKERHUB_USERNAME }}/shuffle-orborus:${{ matrix.version }}
-          docker push ghcr.io/shuffle/shuffle-orborus:${{ matrix.version }}
-          docker push ${{ secrets.DOCKERHUB_USERNAME }}/shuffle-orborus:${{ matrix.version }}
+    uses: ./.github/workflows/sync-orborus.yaml
+    secrets: inherit
+    with:
+      orborus_version: ${{ github.event.inputs.orborus_version || 'latest' }}
diff --git a/.github/workflows/sync-orborus.yaml b/.github/workflows/sync-orborus.yaml
index 524d744a..138ea5ed 100644
--- a/.github/workflows/sync-orborus.yaml
+++ b/.github/workflows/sync-orborus.yaml
@@ -7,6 +7,11 @@ on:
         description: "Orborus version to sync"
         required: true
         default: "latest"
+  workflow_call:
+    inputs:
+      orborus_version:
+        required: true
+        type: string
 
 jobs:
   sync-orborus:
@@ -14,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: ["${{ github.event.inputs.orborus_version }}"]
+        version: ["${{ inputs.orborus_version }}"]
     steps:
       - name: Login to DockerHub
         uses: docker/login-action@v3
diff --git a/.github/workflows/tagged-nightly-release.yaml b/.github/workflows/tagged-nightly-release.yaml
index 2dd41f6e..d0c6aae5 100644
--- a/.github/workflows/tagged-nightly-release.yaml
+++ b/.github/workflows/tagged-nightly-release.yaml
@@ -93,36 +93,7 @@ jobs:
 
   sync-orborus:
     if: github.event.release.target_commitish == 'nightly'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set version
-        id: set_version
-        run: |
-          if [[ ${{ github.event_name }} == 'release' ]]; then
-            VERSION="${{ github.event.release.tag_name }}"
-            VERSION=${VERSION#v}
-            echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
-          else
-            echo "VERSION=nightly-untagged-latest" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Login to Ghcr
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Pull, retag and push orborus
-        run: |
-          docker pull ghcr.io/shuffle/orborus:${{ steps.set_version.outputs.VERSION }}
-          docker tag ghcr.io/shuffle/orborus:${{ steps.set_version.outputs.VERSION }} ghcr.io/shuffle/shuffle-orborus:${{ steps.set_version.outputs.VERSION }}
-          docker tag ghcr.io/shuffle/orborus:${{ steps.set_version.outputs.VERSION }} ${{ secrets.DOCKERHUB_USERNAME }}/shuffle-orborus:${{ steps.set_version.outputs.VERSION }}
-          docker push ghcr.io/shuffle/shuffle-orborus:${{ steps.set_version.outputs.VERSION }}
-          docker push ${{ secrets.DOCKERHUB_USERNAME }}/shuffle-orborus:${{ steps.set_version.outputs.VERSION }}
\ No newline at end of file
+    uses: ./.github/workflows/sync-orborus.yaml
+    secrets: inherit
+    with:
+      orborus_version: ${{ github.event.release.tag_name }}
\ No newline at end of file