From c96da45d8f33aeda0b771a6dd3ef36b56796e3a1 Mon Sep 17 00:00:00 2001
From: Steven Clontz <steven.clontz@gmail.com>
Date: Wed, 19 Jun 2024 19:29:18 -0700
Subject: [PATCH] have deploys depend on tests action

---
 .github/workflows/deploy-nightly.yml          | 36 +-----------------
 .github/workflows/deploy-stable.yml           | 38 +------------------
 .../workflows/{test-on-pr.yml => tests.yml}   |  0
 3 files changed, 4 insertions(+), 70 deletions(-)
 rename .github/workflows/{test-on-pr.yml => tests.yml} (100%)

diff --git a/.github/workflows/deploy-nightly.yml b/.github/workflows/deploy-nightly.yml
index 2f8448ea..b281f8a3 100644
--- a/.github/workflows/deploy-nightly.yml
+++ b/.github/workflows/deploy-nightly.yml
@@ -8,41 +8,9 @@ on:
   workflow_dispatch:
 
 jobs:
-  test:
+  tests:
     name: Run tests
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: ["3.8"]
-        poetry-version: ["1.5.1"]
-        os: [ubuntu-latest]
-
-    runs-on: ${{ matrix.os }}
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: Install poetry ${{ matrix.poetry-version }}
-        run: |
-          python -m ensurepip
-          python -m pip install --upgrade pip
-          python -m pip install poetry==${{ matrix.poetry-version }}
-
-      - name: Install dependencies
-        shell: bash
-        run: |
-          python -m poetry install
-          python -m poetry run python scripts/fetch_core.py
-          python -m poetry run python scripts/zip_templates.py
-
-      - name: Test with pytest
-        run: |
-          python -m poetry run pytest -v --cov
+    uses: ./.github/workflows/tests.yml
 
   deploy:
     needs: test
diff --git a/.github/workflows/deploy-stable.yml b/.github/workflows/deploy-stable.yml
index e850626c..8af52da0 100644
--- a/.github/workflows/deploy-stable.yml
+++ b/.github/workflows/deploy-stable.yml
@@ -24,43 +24,9 @@ on:
           - "legacy-support"
 
 jobs:
-  test:
+  tests:
     name: Run tests
-    strategy:
-      fail-fast: true
-      matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
-        poetry-version: ["1.5.1"]
-        os: [ubuntu-latest, windows-latest]
-
-    runs-on: ${{ matrix.os }}
-
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          ref: ${{ inputs.branch }}
-
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: Install poetry ${{ matrix.poetry-version }}
-        run: |
-          python -m ensurepip
-          python -m pip install --upgrade pip
-          python -m pip install poetry==${{ matrix.poetry-version }}
-
-      - name: Install dependencies
-        shell: bash
-        run: |
-          python -m poetry install
-          python -m poetry run python scripts/fetch_core.py
-          python -m poetry run python scripts/zip_templates.py
-
-      - name: Test with pytest
-        run: |
-          python -m poetry run pytest -v --cov
+    uses: ./.github/workflows/tests.yml
 
   deploy:
     needs: test
diff --git a/.github/workflows/test-on-pr.yml b/.github/workflows/tests.yml
similarity index 100%
rename from .github/workflows/test-on-pr.yml
rename to .github/workflows/tests.yml