From 5f6084d953263e36f605c3ab8e39c92e6ab02b9c Mon Sep 17 00:00:00 2001
From: Brian Rosner <brian@brosner.com>
Date: Sun, 19 May 2024 16:47:30 -0600
Subject: [PATCH] back to ci

---
 .github/workflows/build.yml      | 46 ---------------------------
 .github/workflows/ci.yml         | 53 ++++++++++++++++++++++++++++++++
 .github/workflows/pre-commit.yml | 16 ----------
 .github/workflows/tests.yml      | 37 ----------------------
 4 files changed, 53 insertions(+), 99 deletions(-)
 delete mode 100644 .github/workflows/build.yml
 create mode 100644 .github/workflows/ci.yml
 delete mode 100644 .github/workflows/pre-commit.yml
 delete mode 100644 .github/workflows/tests.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
deleted file mode 100644
index 0e18747..0000000
--- a/.github/workflows/build.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-name: Build
-
-on:
-  workflow_run:
-    workflows: [Tests]
-    types:
-      - completed
-
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.repository }}
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - name: log in to ghcr.io
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          tags: |
-            type=ref,event=branch
-            type=ref,event=pr
-            type=sha
-      - name: build prod image
-        uses: docker/build-push-action@v5
-        if: github.ref == 'refs/heads/main'
-        with:
-          context: .
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          target: prod
-          load: true
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-          push: true
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..5ff1f76
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,53 @@
+name: CI
+
+on:
+  pull_request:
+    branches: [main]
+  push:
+    branches: [main]
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+  pre-commit:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+      - uses: pre-commit/action@v3.0.1
+  tests:
+    runs-on: ubuntu-latest
+    services:
+      postgres:
+        image: postgres
+        env:
+          POSTGRES_PASSWORD: postgres
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 5432:5432
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup docker buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Build container image
+        uses: docker/build-push-action@v5
+        with:
+          push: false
+          tags: ${{ env.IMAGE_NAME }}:ci
+          target: ci
+          load: true
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+      - name: Run pytest
+        uses: addnab/docker-run-action@v3
+        with:
+          image: ${{ env.IMAGE_NAME }}:ci
+          run: pytest
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
deleted file mode 100644
index 8a633a3..0000000
--- a/.github/workflows/pre-commit.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: Pre-commit
-
-on:
-  pull_request:
-  push:
-    branches: [main]
-
-jobs:
-  pre-commit:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: "3.12"
-      - uses: pre-commit/action@v3.0.1
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
deleted file mode 100644
index 99c3694..0000000
--- a/.github/workflows/tests.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-name: Tests
-
-on:
-  pull_request:
-    branches: [main]
-  push:
-    branches: [main]
-
-jobs:
-  tests:
-    runs-on: ubuntu-latest
-    services:
-      postgres:
-        image: postgres
-        env:
-          POSTGRES_PASSWORD: postgres
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        ports:
-          - 5432:5432
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.12"
-      - name: Run image
-        uses: abatilo/actions-poetry@v3
-        with:
-          poetry-version: "1.8.3"
-      - name: Install dependencies
-        run: poetry install --with=dev
-      - name: Run pytest
-        run: poetry run pytest