ci: always run tests as an unprivileged user

Signed-off-by: Phillip Wood <[email protected]>
phillipwood · Nov 1, 2023 · a2d3262 · a2d3262
1 parent 9e81214
commit a2d3262
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -12,9 +12,7 @@ test:
   before_script:
     - ./ci/install-docker-dependencies.sh
   script:
-    - useradd builder --create-home
-    - chown -R builder "${CI_PROJECT_DIR}"
-    - sudo --preserve-env --set-home --user=builder ./ci/run-build-and-tests.sh
+    - ./ci/run-build-and-tests.sh
   after_script:
     - |
       if test "$CI_JOB_STATUS" != 'success'

diff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh
@@ -3,6 +3,13 @@
 # Build and test Git
 #
 
+if test "$(id -u)" -eq 0
+then
+    useradd --home-dir "$(pwd)" builder
+    chown -R builder .
+    exec sudo --preserve-env --set-home --user=builder "$0"
+fi
+
 . ${0%/*}/lib.sh
 
 case "$CI_OS_NAME" in