From 19d5c959f413c20890ec4aba3fb0068a6fb72d0a Mon Sep 17 00:00:00 2001
From: crystal <crystal@noreply.codeberg.org>
Date: Sat, 25 Nov 2023 17:37:24 -0700
Subject: [PATCH] remove forgejo test_env

---
 .ci-make.sh             | 6 ++++++
 .crystalintegration.yml | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.ci-make.sh b/.ci-make.sh
index 1c35250..77a3edf 100755
--- a/.ci-make.sh
+++ b/.ci-make.sh
@@ -142,5 +142,11 @@ case "$1" in
 		killall forgejo
 		exit $?
 		;;
+	"forgejo-test-deps")
+		apt update
+		apt install --no-install-recommends -y git-lfs
+		adduser --quiet --comment forgejo --disabled-password forgejo
+		chown -R forgejo:forgejo .
+		;;
 esac
 		
diff --git a/.crystalintegration.yml b/.crystalintegration.yml
index b1dd5d4..5b483aa 100644
--- a/.crystalintegration.yml
+++ b/.crystalintegration.yml
@@ -6,7 +6,7 @@ when:
 variables:
   - &ci_verify_image 'sc.cryxtal.org/ci-img/git-curl-jq:latest'
   - &golang_image 'golang:1.20-bullseye'
-  - &forgejo_test_image 'codeberg.org/forgejo/test_env:1.20'
+  - &forgejo_test_image 'docker.io/node:20-bookworm'
   - &nodejs_image 'node:lts'
   - &bin_dl_image 'sc.cryxtal.org/ci-img/bin-dl:latest'
   - &deb_build_image 'sc.cryxtal.org/ci-img/dh:bullseye'
@@ -111,13 +111,13 @@ steps:
     image: *forgejo_test_image
     group: checks
     environment:
-      BUILD_SUBMODULE: *build_submodule
       GOPROXY_OVERRIDE: *goproxy_override
     secrets:
       - goproxy_default
     commands:
       - *goproxy_setup
-      - ./.ci-make.sh submodule-make "$BUILD_SUBMODULE" checks-backend
+      - ./.ci-make.sh forgejo-test-deps
+      - su forgejo -c './.ci-make.sh submodule-make forgejo checks-backend'
 
   download-bin-amd64:
     image: *bin_dl_image