From 3d0081780cc60bcb23168ce1dc8c403338ddeb43 Mon Sep 17 00:00:00 2001
From: Donavan Fritz <dfritz@netflix.com>
Date: Wed, 6 May 2026 08:14:35 -0500
Subject: [PATCH] ci: migrate to action/ org composite actions

---
 .gitea/workflows/main.yaml | 22 +++++++++++-----------
 .gitea/workflows/pr.yaml   | 16 ++++++++++++++++
 2 files changed, 27 insertions(+), 11 deletions(-)
 create mode 100644 .gitea/workflows/pr.yaml

diff --git a/.gitea/workflows/main.yaml b/.gitea/workflows/main.yaml
index 22234c9..e05b53b 100644
--- a/.gitea/workflows/main.yaml
+++ b/.gitea/workflows/main.yaml
@@ -1,24 +1,24 @@
-name: Build flock Image
+name: flock
 on:
   push:
     branches: [main]
 jobs:
-  build:
+  release:
     runs-on: fritzlab
     steps:
       - uses: actions/checkout@v4
 
-      - uses: https://code.fritzlab.net/fritzlab/build-image@v1
+      - uses: https://code.fritzlab.net/action/image-build@v1
+        with:
+          image: code.fritzlab.net/fritzlab/flock
+          build-args: GIT_SHA=${{ github.sha }}
+          smoke-test: |
+            docker run --rm $IMAGE --help || true
+            docker run --rm --entrypoint /usr/local/bin/flock $IMAGE || true
+
+      - uses: https://code.fritzlab.net/action/image-push@v1
         with:
           image: code.fritzlab.net/fritzlab/flock
           token: ${{ secrets.CI_BOT_TOKEN }}
           org: fritzlab
           name: flock
-          build-args: GIT_SHA=${{ github.sha }}
-
-      - name: Smoke-test image
-        run: |
-          docker run --rm code.fritzlab.net/fritzlab/flock:${{ github.run_number }} --help || true
-          docker run --rm --entrypoint /usr/local/bin/flock \
-            code.fritzlab.net/fritzlab/flock:${{ github.run_number }} || true
-
diff --git a/.gitea/workflows/pr.yaml b/.gitea/workflows/pr.yaml
new file mode 100644
index 0000000..27cdbd7
--- /dev/null
+++ b/.gitea/workflows/pr.yaml
@@ -0,0 +1,16 @@
+name: flock PR validation
+on:
+  pull_request:
+    branches: [main]
+jobs:
+  validate:
+    runs-on: fritzlab
+    steps:
+      - uses: actions/checkout@v4
+      - uses: https://code.fritzlab.net/action/image-build@v1
+        with:
+          image: code.fritzlab.net/fritzlab/flock
+          build-args: GIT_SHA=${{ github.sha }}
+          smoke-test: |
+            docker run --rm $IMAGE --help || true
+            docker run --rm --entrypoint /usr/local/bin/flock $IMAGE || true