From fd201672eafa8326ad386ec643285a2f73978a41 Mon Sep 17 00:00:00 2001
From: Larry Ruckman <ruckman@slac.stanford.edu>
Date: Thu, 2 May 2024 12:16:46 -0700
Subject: [PATCH 1/2] Update rogue_ci.yml

### Description
- Updating CI to use the common `gen_release` workflow
---
 .github/workflows/rogue_ci.yml | 45 +++++++++++-----------------------
 1 file changed, 14 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/rogue_ci.yml b/.github/workflows/rogue_ci.yml
index 6df5dfd08..7e39b1718 100644
--- a/.github/workflows/rogue_ci.yml
+++ b/.github/workflows/rogue_ci.yml
@@ -99,6 +99,8 @@ jobs:
           github_token: ${{ secrets.GH_TOKEN }}
           publish_dir: docs/build/html
 
+# ----------------------------------------------------------------------------
+
   small_build_test:
     name: Small Build Test
     runs-on: ubuntu-20.04
@@ -122,39 +124,17 @@ jobs:
           make -j4 install
 
 
-  gen_release:
-    name: Generate Release
-    runs-on: ubuntu-20.04
-    needs: [full_build_test, small_build_test]
-    if: startsWith(github.ref, 'refs/tags/')
-    steps:
-
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - uses: actions/setup-python@v4
-        with:
-          python-version: 3.8
-
-      - name: Get Image Information
-        id: get_image_info
-        run: |
-          echo tag=`git describe --tags` >> ${GITHUB_OUTPUT}
+# ----------------------------------------------------------------------------
 
-      - name: Get Ruckus
-        run: |
-          git clone https://github.com/slaclab/ruckus.git
-          python -m pip install --upgrade pip
-          pip install -r ruckus/scripts/pip_requirements.txt
+  gen_release:
+    needs: [test_and_document]
+    uses: slaclab/ruckus/.github/workflows/gen_release.yml@main
+    with:
+      version: '1.0.0'
+    secrets:
+      GH_TOKEN: ${{ secrets.GH_TOKEN }}
 
-      - name: Gen Release
-        env:
-          TRAVIS_REPO_SLUG: ${{ github.repository }}
-          TRAVIS_TAG: ${{ steps.get_image_info.outputs.tag }}
-          GH_REPO_TOKEN: ${{ secrets.GH_TOKEN }}
-        run: |
-          python ruckus/scripts/releaseGen.py
+# ----------------------------------------------------------------------------
 
   conda_build:
     name: Anaconda Build
@@ -206,6 +186,8 @@ jobs:
           source ${HOME}/miniconda/etc/profile.d/conda.sh
           anaconda -t ${{ steps.get_image_info.outputs.token }} upload --force bld-dir/*/*.tar.bz2
 
+# ----------------------------------------------------------------------------
+
   docker_build:
     name: Docker Build
     runs-on: ubuntu-20.04
@@ -245,3 +227,4 @@ jobs:
           tags: tidair/rogue:${{ steps.get_image_info.outputs.tag }}, tidair/rogue:latest
           build-args: branch=${{ steps.get_image_info.outputs.branch }}
 
+# ----------------------------------------------------------------------------

From b83cd5acca6fc4fca05428c48a35c53c8023b0b6 Mon Sep 17 00:00:00 2001
From: Larry Ruckman <ruckman@slac.stanford.edu>
Date: Thu, 2 May 2024 12:20:06 -0700
Subject: [PATCH 2/2] bug fix

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

diff --git a/.github/workflows/rogue_ci.yml b/.github/workflows/rogue_ci.yml
index 7e39b1718..c96a50fed 100644
--- a/.github/workflows/rogue_ci.yml
+++ b/.github/workflows/rogue_ci.yml
@@ -127,7 +127,7 @@ jobs:
 # ----------------------------------------------------------------------------
 
   gen_release:
-    needs: [test_and_document]
+    needs: [full_build_test, small_build_test]
     uses: slaclab/ruckus/.github/workflows/gen_release.yml@main
     with:
       version: '1.0.0'