From 4551299e513a12ce1e8cc0a5d5b5182a903521d1 Mon Sep 17 00:00:00 2001
From: Otto Richter <git@otto.splvs.net>
Date: Tue, 1 Oct 2024 21:02:00 +0200
Subject: [PATCH] ci: merge e2e workflow into testing.yml

---
 .../workflows-composite/setup-env/action.yaml |  3 +-
 .forgejo/workflows/e2e.yml                    | 37 -------------------
 .forgejo/workflows/testing.yml                | 17 +++++++++
 3 files changed, 19 insertions(+), 38 deletions(-)
 delete mode 100644 .forgejo/workflows/e2e.yml

diff --git a/.forgejo/workflows-composite/setup-env/action.yaml b/.forgejo/workflows-composite/setup-env/action.yaml
index 65ffa8341c..d40ee52d20 100644
--- a/.forgejo/workflows-composite/setup-env/action.yaml
+++ b/.forgejo/workflows-composite/setup-env/action.yaml
@@ -4,7 +4,8 @@ runs:
     - name: setup user and permissions
       run: |
         git config --add safe.directory '*'
-        adduser --quiet --comment forgejo --disabled-password forgejo
+        # ignore if the user already exists (like with the playwright image)
+        adduser --quiet --comment forgejo --disabled-password forgejo || true
         chown -R forgejo:forgejo .
     - uses: https://codeberg.org/fnetx/setup-cache-go@b2214eaf6fb44c7e8512c0f462a2c3ec31f86a73
       with:
diff --git a/.forgejo/workflows/e2e.yml b/.forgejo/workflows/e2e.yml
deleted file mode 100644
index 7e27765513..0000000000
--- a/.forgejo/workflows/e2e.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-name: e2e
-
-on:
-  pull_request:
-    paths:
-      - Makefile
-      - playwright.config.js
-      - .forgejo/workflows/e2e.yml
-      - tests/e2e/**
-      - web_src/js/**
-      - web_src/css/form.css
-      - templates/webhook/shared-settings.tmpl
-      - templates/org/team/new.tmpl
-
-jobs:
-  test-e2e:
-    if: ${{ !startsWith(vars.ROLE, 'forgejo-') }}
-    runs-on: docker
-    container:
-      image: 'code.forgejo.org/oci/playwright:latest'
-    steps:
-      - uses: https://code.forgejo.org/actions/checkout@v4
-      - uses: https://code.forgejo.org/actions/setup-go@v5
-        with:
-          go-version-file: "go.mod"
-      - run: |
-          git config --add safe.directory '*'
-          chown -R forgejo:forgejo .
-      - run: |
-          su forgejo -c 'make deps-frontend frontend deps-backend'
-      - run: |
-          su forgejo -c 'make backend'
-      - run: |
-          su forgejo -c 'make generate test-e2e-sqlite'
-        timeout-minutes: 40
-        env:
-          USE_REPO_TEST_DIR: 1
diff --git a/.forgejo/workflows/testing.yml b/.forgejo/workflows/testing.yml
index 03c6672535..4c71169b28 100644
--- a/.forgejo/workflows/testing.yml
+++ b/.forgejo/workflows/testing.yml
@@ -75,6 +75,23 @@ jobs:
           RACE_ENABLED: 'true'
           TAGS: bindata
           TEST_ELASTICSEARCH_URL: http://elasticsearch:9200
+  test-e2e:
+    if: ${{ !startsWith(vars.ROLE, 'forgejo-') }}
+    runs-on: docker
+    needs: [backend-checks, frontend-checks]
+    container:
+      image: 'code.forgejo.org/oci/playwright:latest'
+    steps:
+      - uses: https://code.forgejo.org/actions/checkout@v4
+      - uses: ./.forgejo/workflows-composite/setup-env
+      - run: |
+          su forgejo -c 'make deps-frontend frontend deps-backend'
+      - uses: ./.forgejo/workflows-composite/build-backend
+      - run: |
+          su forgejo -c 'make generate test-e2e-sqlite'
+        timeout-minutes: 40
+        env:
+          USE_REPO_TEST_DIR: 1
   test-remote-cacher:
     if: ${{ !startsWith(vars.ROLE, 'forgejo-') }}
     runs-on: docker