From e9e5d6bb2ad2f00a83d1126f03993e6536e30612 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Hells=C3=A9n?= <tlovinator@gmail.com>
Date: Mon, 26 Sep 2022 02:27:35 +0200
Subject: [PATCH] Actually merge pytest.yml and build.yml

---
 .github/workflows/{deploy.yml => build.yml} | 30 +++++++++++----------
 .github/workflows/pytest.yml                | 28 -------------------
 2 files changed, 16 insertions(+), 42 deletions(-)
 rename .github/workflows/{deploy.yml => build.yml} (69%)
 delete mode 100644 .github/workflows/pytest.yml

diff --git a/.github/workflows/deploy.yml b/.github/workflows/build.yml
similarity index 69%
rename from .github/workflows/deploy.yml
rename to .github/workflows/build.yml
index 651ba3a..245f78d 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/build.yml
@@ -1,26 +1,28 @@
 ---
-name: Docker
-on:
-  schedule:
-    - cron: "20 6 * * *"
-  workflow_run:
-    workflows: [ "pytest" ]
-    types:
-      - completed
-  workflow_dispatch:
-
+name: Test code, build Docker image, and push to Docker Hub and GitHub Container Registry.
+on: [ push, pull_request, workflow_dispatch ]
 env:
+  SERVE_DOMAIN: https://localhost/
+  WEBHOOK_URL: ${{ secrets.WEBHOOK_URL }}
+  UPLOAD_FOLDER: ./Uploads
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
 jobs:
-  build:
+  test:
     runs-on: ubuntu-latest
     permissions:
       contents: read
       packages: write
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
+      - uses: actions/checkout@v3
+      - run: pipx install poetry
+      - uses: FedericoCarboni/setup-ffmpeg@v1
+        id: setup-ffmpeg
+      - uses: actions/setup-python@v4
+        with:
+          python-version: "3.10"
+          cache: 'poetry'
+      - run: poetry install
+      - run: poetry run pytest
       - name: Login to Docker Hub
         if: github.event_name != 'pull_request'
         uses: docker/login-action@v2
diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
deleted file mode 100644
index fb14cae..0000000
--- a/.github/workflows/pytest.yml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-name: pytest
-on: [ push, pull_request, workflow_dispatch ]
-env:
-  SERVE_DOMAIN: https://localhost/
-  WEBHOOK_URL: ${{ secrets.WEBHOOK_URL }}
-  UPLOAD_FOLDER: ./Uploads
-jobs:
-  test:
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: [ "3.9", "3.10" ]
-        os: [ ubuntu-latest, windows-latest ]
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v3
-      - run: pipx install poetry
-      - name: Install ffmpeg
-        uses: FedericoCarboni/setup-ffmpeg@v1
-        id: setup-ffmpeg
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-          cache: 'poetry'
-      - run: poetry install
-      - run: poetry run pytest
\ No newline at end of file