From 95be7dfabfeddfe09140e9a42f4590ce992fcdc0 Mon Sep 17 00:00:00 2001
From: Candace Savonen <cansav09@gmail.com>
Date: Tue, 7 Jan 2025 09:26:21 -0500
Subject: [PATCH] Update

---
 .github/workflows/merge.yml        | 24 ++++++++++++++++++++----
 .github/workflows/pull_request.yml | 16 ++++++++--------
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
index 7ec8977..1c579a4 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/merge.yml
@@ -35,15 +35,31 @@ jobs:
         with:
           files: bioconductor/*
 
+      - name: Get specific changed files
+        id: python
+        uses: tj-actions/changed-files@v14.5
+        with:
+          files: python/*
+
+      - name: Get specific changed files
+        id: jupyter
+        uses: tj-actions/changed-files@v14.5
+        with:
+          files: jupyter/*
+
       - run: |
           echo ${{steps.base_ottr.outputs.any_changed}}
           echo ${{steps.ottrpal.outputs.any_changed}}
           echo ${{steps.bioconductor.outputs.any_changed}}
+          echo ${{steps.python.outputs.any_changed}}
+          echo ${{steps.jupyter.outputs.any_changed}}
 
     outputs:
       base_ottr_changed: ${{steps.base_ottr.outputs.any_changed}}
       ottrpal_changed: ${{steps.ottrpal.outputs.any_changed}}
       bioconductor_changed: ${{steps.bioconductor.outputs.any_changed}}
+      python_changed: ${{steps.python.outputs.any_changed}}
+      quarto_changed: ${{steps.jupyter.outputs.any_changed}}
 
   build-base:
     name: Build base ottr image
@@ -87,14 +103,14 @@ jobs:
       DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
 
-  build-quarto:
+  build-jupyter:
     name: Build quarto image
     needs: dockerfiles-changed
-    if: ${{needs.dockerfiles-changed.outputs.quarto_changed == 'true'}}
+    if: ${{needs.dockerfiles-changed.outputs.jupyter_changed == 'true'}}
     uses: ./.github/workflows/docker-test.yml
     with:
-      directory: ottr_quarto
-      tag: jhudsl/ottr_quarto
+      directory: ottr_jupyter
+      tag: jhudsl/ottr_jupyter
       dockerhubpush: true
     secrets:
       GH_PAT: ${{ secrets.GH_PAT }}
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index e8f85f1..6266583 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -45,21 +45,21 @@ jobs:
         id: quarto
         uses: tj-actions/changed-files@v14.5
         with:
-          files: ottr_quarto/*
+          files: ottr_jupyter/*
 
       - run: |
           echo ${{steps.base_ottr.outputs.any_changed}}
           echo ${{steps.ottrpal.outputs.any_changed}}
           echo ${{steps.bioconductor.outputs.any_changed}}
           echo ${{steps.python.outputs.any_changed}}
-          echo ${{steps.quarto.outputs.any_changed}}
+          echo ${{steps.jupyter.outputs.any_changed}}
 
     outputs:
       base_ottr_changed: ${{steps.base_ottr.outputs.any_changed}}
       ottrpal_changed: ${{steps.ottrpal.outputs.any_changed}}
       bioconductor_changed: ${{steps.bioconductor.outputs.any_changed}}
       python_changed: ${{steps.python.outputs.any_changed}}
-      quarto_changed: ${{steps.quarto.outputs.any_changed}}
+      quarto_changed: ${{steps.jupyter.outputs.any_changed}}
 
   build-base:
     name: Build base ottr image
@@ -105,13 +105,13 @@ jobs:
     secrets:
       GH_PAT: ${{ secrets.GH_PAT }}
 
-  build-quarto:
-    name: Build quarto ottr image
+  build-jupyter:
+    name: Build jupyter ottr image
     needs: dockerfiles-changed
-    if: ${{needs.dockerfiles-changed.outputs.quarto_changed == 'true'}}
+    if: ${{needs.dockerfiles-changed.outputs.jupyter_changed == 'true'}}
     uses: ./.github/workflows/docker-test.yml
     with:
-      directory: ottr_quarto
-      tag: jhudsl/ottr_quarto
+      directory: ottr_jupyter
+      tag: jhudsl/ottr_jupyter
     secrets:
       GH_PAT: ${{ secrets.GH_PAT }}