.gitea/workflows/deploy.yml

@@ -1,36 +1,20 @@
 name: Deploy Company Site
 
 on:
-  push:
-    branches: [master]
-  pull_request:
+  workflow_run:
+    workflows: [Unit Tests]
+    types: [completed]
     branches: [master]
 
 jobs:
-  test:
-    runs-on: self-hosted
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Set up Python environment
-        run: |
-          python3 -m venv .venv
-          .venv/bin/pip install --upgrade pip
-          .venv/bin/pip install -r requirements.txt
-
-      - name: Run unit tests
-        run: |
-          cd company_site
-          ../.venv/bin/python manage.py test
-
   deploy:
-    needs: test
-    if: gitea.event_name == 'push' && gitea.ref == 'refs/heads/master'
+    if: gitea.event.workflow_run.conclusion == 'success' && gitea.event.workflow_run.event == 'push'
     runs-on: self-hosted
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          ref: ${{ gitea.event.workflow_run.head_sha }}
 
       - name: Deploy to live site
         run: bash scripts/deploy.sh "${{ gitea.workspace }}"

.gitea/workflows/unittests.yml

@@ -0,0 +1,25 @@
+name: Unit Tests
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  test:
+    runs-on: self-hosted
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Python environment
+        run: |
+          python3 -m venv .venv
+          .venv/bin/pip install --upgrade pip
+          .venv/bin/pip install -r requirements.txt
+
+      - name: Run unit tests
+        run: |
+          cd company_site
+          ../.venv/bin/python manage.py test