From 85ee45c7a1a3ae4a573f029ff3d8b0e1240a8d09 Mon Sep 17 00:00:00 2001
From: cascode <cascode@admin.communitymedia.network>
Date: Sat, 21 Oct 2023 13:54:28 -0700
Subject: [PATCH] re-merge file

---
 .gitea/workflows/checks.yml | 11 +++++++++++
 .gitea/workflows/lint.yml   | 19 -------------------
 2 files changed, 11 insertions(+), 19 deletions(-)
 delete mode 100644 .gitea/workflows/lint.yml

diff --git a/.gitea/workflows/checks.yml b/.gitea/workflows/checks.yml
index a4a5adc..4165ecf 100644
--- a/.gitea/workflows/checks.yml
+++ b/.gitea/workflows/checks.yml
@@ -12,6 +12,17 @@ on:
       - main
 
 jobs:
+  # TODO(cascode) cache checkout for build and test stages?
+  lint:
+    container:
+      # TODO use communitymedia docker registry
+      image: "cascode/aural-isle-ci:0"
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          github-server-url: "https://code.communitymedia.network"
+      - name: rustfmt
+        run: cargo fmt --check
   build:
     container:
       # TODO use communitymedia docker registry
diff --git a/.gitea/workflows/lint.yml b/.gitea/workflows/lint.yml
deleted file mode 100644
index b4eb8aa..0000000
--- a/.gitea/workflows/lint.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-name: lint
-on:
-  pull_request:
-  push:
-    branches:
-      - main
-
-jobs:
-  # TODO(cascode) cache checkout for build and test stages?
-  lint:
-    container:
-      # TODO use communitymedia docker registry
-      image: "cascode/aural-isle-ci:0"
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          github-server-url: "https://code.communitymedia.network"
-      - name: rustfmt
-        run: cargo fmt --check