From 4f57f49ebe5395a4c3a8e20c84c5d881c9f98dfc Mon Sep 17 00:00:00 2001
From: Shyam Sunder
Date: Wed, 15 Sep 2021 16:06:48 -0400
Subject: client+server: migrate to GitHub actions

---
 .github/workflows/run-unit-tests.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 .github/workflows/run-unit-tests.yml

(limited to '.github/workflows/run-unit-tests.yml')

diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml
new file mode 100644
index 0000000..87ab4e8
--- /dev/null
+++ b/.github/workflows/run-unit-tests.yml
@@ -0,0 +1,16 @@
+name: run-unit-tests
+on: [pull_request]
+jobs:
+  test-server:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Build test container
+        run: |
+          TAG=$(docker build --target testing -q ./server)
+          echo "image_tag=${TAG}" >> $GITHUB_ENV
+
+      - name: Run unit tests
+        run: docker run --rm -t ${{ env.image_tag }} --color=no szurubooru/
-- 
cgit v1.3


From d699979d359949789be27b7927b00cacefef1f21 Mon Sep 17 00:00:00 2001
From: Shyam Sunder
Date: Thu, 23 Sep 2021 12:38:08 -0400
Subject: client+server: cleanup GitHub actions workflow names

Also run unit test action on push
---
 .github/workflows/build-containers.yml |  4 +++-
 .github/workflows/run-unit-tests.yml   | 24 ++++++++++++++++++------
 .pre-commit-config.yaml                | 11 -----------
 3 files changed, 21 insertions(+), 18 deletions(-)

(limited to '.github/workflows/run-unit-tests.yml')

diff --git a/.github/workflows/build-containers.yml b/.github/workflows/build-containers.yml
index 518bf5b..3dda368 100644
--- a/.github/workflows/build-containers.yml
+++ b/.github/workflows/build-containers.yml
@@ -1,7 +1,8 @@
-name: build-containers
+name: Build Docker containers
 on: [push]
 jobs:
   build-client:
+    name: Build and push client/ Docker container
     runs-on: ubuntu-latest
     steps:
       - name: Login to Docker Hub
@@ -53,6 +54,7 @@ jobs:
           ./client
 
   build-server:
+    name: Build and push server/ Docker container
     runs-on: ubuntu-latest
     steps:
       - name: Login to Docker Hub
diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml
index 87ab4e8..9ea14ed 100644
--- a/.github/workflows/run-unit-tests.yml
+++ b/.github/workflows/run-unit-tests.yml
@@ -1,16 +1,28 @@
-name: run-unit-tests
-on: [pull_request]
+name: Run unit tests
+on: [push, pull_request]
 jobs:
   test-server:
+    name: Run pytest for server/
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v2
 
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
+
       - name: Build test container
-        run: |
-          TAG=$(docker build --target testing -q ./server)
-          echo "image_tag=${TAG}" >> $GITHUB_ENV
+        run: >
+          docker buildx build --load
+          --platform linux/amd64 --target testing
+          -t test_container
+          ./server
 
       - name: Run unit tests
-        run: docker run --rm -t ${{ env.image_tag }} --color=no szurubooru/
+        run: >
+          docker run --rm -t test_container
+          --color=no
+          --cov-report=term-missing:skip-covered
+          --cov=szurubooru
+          szurubooru/
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 5053b6e..c793e75 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -83,17 +83,6 @@ repos:
         files: server/szurubooru/
         exclude: server/szurubooru/migrations/
         pass_filenames: false
-        stages: [push]
-
-    -   id: pytest-cov
-        name: pytest
-        entry: bash -c 'docker run --rm -t $(docker build --target testing -q server/) --cov-report=term-missing:skip-covered --cov=szurubooru szurubooru/'
-        language: system
-        types: [python]
-        files: server/szurubooru/
-        exclude: server/szurubooru/migrations/
-        pass_filenames: false
-        verbose: true
         stages: [manual]
 
 fail_fast: true
-- 
cgit v1.3