From 62cf1b9efcf13239bd0db69eae48c655cd7ac542 Mon Sep 17 00:00:00 2001
From: hholb <hholbrook@uchicago.edu>
Date: Wed, 11 Mar 2026 12:04:41 -0600
Subject: [PATCH 1/5] setup deploy action

---
 .github/workflows/ci.yaml | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 .github/workflows/ci.yaml

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
new file mode 100644
index 0000000..9204f37
--- /dev/null
+++ b/.github/workflows/ci.yaml
@@ -0,0 +1,35 @@
+name: Deploy
+on:
+  push:
+    branches:
+      - main
+      - dev
+  merge:
+    branches:
+      - main
+      - dev
+
+jobs:
+  Deploy:
+    runs-on: ubuntu-latest
+    env:
+      MODAL_TOKEN_ID: ${{ secrets.MODAL_TOKEN_ID }}
+      MODAL_TOKEN_SECRET: ${{ secrets.MODAL_TOKEN_SECRET }}
+      MODAL_ENVIRONMENT: ${{ case(github.ref_name == "main", "prod", github.ref_name == "dev", "dev") }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v6
+
+      - name: Install python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.10"
+      
+      - name: Install Modal
+        run: |
+          python -m pip install --upgrade pip
+          pip install modal
+
+      - name: Deploy to Modal
+        run: |
+          modal deploy modal_app.py

From 455f840be49774aa30b61c7cc20a1838daaff700 Mon Sep 17 00:00:00 2001
From: hholb <hholbrook@uchicago.edu>
Date: Wed, 11 Mar 2026 12:10:29 -0600
Subject: [PATCH 2/5] fix error in action trigger

---
 .github/workflows/ci.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 9204f37..9084e00 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -4,13 +4,14 @@ on:
     branches:
       - main
       - dev
-  merge:
+  pull_request:
+    types: closed
     branches:
-      - main
       - dev
 
 jobs:
   Deploy:
+    if: github.event.pull_request.merged == true || github.ref_name == "main"
     runs-on: ubuntu-latest
     env:
       MODAL_TOKEN_ID: ${{ secrets.MODAL_TOKEN_ID }}

From d38274e9f45e425c7f4e84ff846e36fe96cdf17f Mon Sep 17 00:00:00 2001
From: hholb <hholbrook@uchicago.edu>
Date: Wed, 11 Mar 2026 12:12:27 -0600
Subject: [PATCH 3/5] rename to deploy.yaml

---
 .github/workflows/{ci.yaml => deploy.yaml} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename .github/workflows/{ci.yaml => deploy.yaml} (100%)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/deploy.yaml
similarity index 100%
rename from .github/workflows/ci.yaml
rename to .github/workflows/deploy.yaml

From 399d848242772b45644472a4f6c47f8e01d05dbb Mon Sep 17 00:00:00 2001
From: hholb <hholbrook@uchicago.edu>
Date: Wed, 11 Mar 2026 12:16:36 -0600
Subject: [PATCH 4/5] tweaks

---
 .github/workflows/deploy.yaml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index 9084e00..e5807f6 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -11,12 +11,16 @@ on:
 
 jobs:
   Deploy:
-    if: github.event.pull_request.merged == true || github.ref_name == "main"
+    if: (github.ref_name == 'dev' && github.event.pull_request.merged == true) || github.ref_name == 'main'
     runs-on: ubuntu-latest
     env:
       MODAL_TOKEN_ID: ${{ secrets.MODAL_TOKEN_ID }}
       MODAL_TOKEN_SECRET: ${{ secrets.MODAL_TOKEN_SECRET }}
-      MODAL_ENVIRONMENT: ${{ case(github.ref_name == "main", "prod", github.ref_name == "dev", "dev") }}
+      MODAL_ENVIRONMENT: |-
+        ${{ case(
+          github.ref_name == 'main', 'prod',
+          github.ref_name == 'dev', 'dev'
+        ) }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v6

From e53eeb98de32abd8533f2b613ab97d6ca1192409 Mon Sep 17 00:00:00 2001
From: hholb <hholbrook@uchicago.edu>
Date: Wed, 11 Mar 2026 12:17:42 -0600
Subject: [PATCH 5/5] fix case params

---
 .github/workflows/deploy.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index e5807f6..bf402af 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -19,7 +19,8 @@ jobs:
       MODAL_ENVIRONMENT: |-
         ${{ case(
           github.ref_name == 'main', 'prod',
-          github.ref_name == 'dev', 'dev'
+          github.ref_name == 'dev', 'dev',
+          'dev'
         ) }}
     steps:
       - name: Checkout code