From 01539730c061c382d4caa8879c99588ab4aca408 Mon Sep 17 00:00:00 2001
From: oliverpool <git@olivier.pfad.fr>
Date: Fri, 9 Feb 2024 11:08:19 +0100
Subject: [PATCH] CI: merge checks-backend and lint-backend

---
 .forgejo/workflows/testing.yml | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/.forgejo/workflows/testing.yml b/.forgejo/workflows/testing.yml
index dd0b280dc..4270a30be 100644
--- a/.forgejo/workflows/testing.yml
+++ b/.forgejo/workflows/testing.yml
@@ -8,7 +8,7 @@ on:
       - 'v*/forgejo*'
 
 jobs:
-  lint-backend:
+  backend-checks:
     if: ${{ !startsWith(vars.ROLE, 'forgejo-') }}
     runs-on: docker
     container:
@@ -20,26 +20,13 @@ jobs:
           go-version: "1.21"
           check-latest: true
       - run: make deps-backend deps-tools
-      - run: make lint-backend
+      - run: make --always-make lint-backend checks-backend # ensure the "go-licenses" make target runs
         env:
           TAGS: bindata sqlite sqlite_unlock_notify
-  checks-backend:
-    if: ${{ !startsWith(vars.ROLE, 'forgejo-') }}
-    runs-on: docker
-    container:
-      image: 'docker.io/node:20-bookworm'
-    steps:
-      - uses: https://code.forgejo.org/actions/checkout@v3
-      - uses: https://code.forgejo.org/actions/setup-go@v4
-        with:
-          go-version: "1.21"
-          check-latest: true
-      - run: make deps-backend deps-tools
-      - run: make --always-make checks-backend # ensure the "go-licenses" make target runs
   test-unit:
     if: ${{ !startsWith(vars.ROLE, 'forgejo-') }}
     runs-on: docker
-    needs: [lint-backend, checks-backend]
+    needs: [backend-checks]
     container:
       image: 'docker.io/node:20-bookworm'
     services:
@@ -80,7 +67,7 @@ jobs:
   test-mysql:
     if: ${{ !startsWith(vars.ROLE, 'forgejo-') }}
     runs-on: docker
-    needs: [lint-backend, checks-backend]
+    needs: [backend-checks]
     container:
       image: 'docker.io/node:20-bookworm'
     services:
@@ -126,7 +113,7 @@ jobs:
   test-pgsql:
     if: ${{ !startsWith(vars.ROLE, 'forgejo-') }}
     runs-on: docker
-    needs: [lint-backend, checks-backend]
+    needs: [backend-checks]
     container:
       image: 'docker.io/node:20-bookworm'
     services:
@@ -174,7 +161,7 @@ jobs:
   test-sqlite:
     if: ${{ !startsWith(vars.ROLE, 'forgejo-') }}
     runs-on: docker
-    needs: [lint-backend, checks-backend]
+    needs: [backend-checks]
     container:
       image: 'docker.io/node:20-bookworm'
     steps: