Fix future tests

Author: Michael Vasseur

.github/jobs/baseinstall.sh

@@ -12,7 +12,9 @@ export PHPVERSION
 
 section_start "Run composer"
 export APP_ENV="dev"
+cd webapp
 composer install --no-scripts |tee "$ARTIFACTS"/composer_out.txt
+cd ..
 section_end
 
 section_start "Set simple admin password"

.github/jobs/composer_setup.sh

@@ -48,5 +48,6 @@ echo "$PHPVERSION" | tee -a "$ARTIFACTS"/phpversion.txt
 section_end
 
 section_start "Run composer"
+cd webapp
 composer install --no-scripts 2>&1 | tee -a "$ARTIFACTS/composer_log.txt"
 section_end

.github/workflows/codeql-analysis.yml

@@ -41,7 +41,9 @@ jobs:
 
     - name: Install composer files
       if: ${{ contains(env.COMPILED, matrix.language) }}
-      run: composer install --no-scripts
+      run: |
+        cd webapp
+        composer install --no-scripts
 
     - name: Configure Makefile
       if: ${{ contains(env.COMPILED, matrix.language) }}

gitlab/base.sh

@@ -55,6 +55,8 @@ parameters:
     domjudge.baseurl: http://localhost/domjudge
 EOF
 
+# Composer steps
+cd webapp
 # install check if the cache might be dirty
 set +e
 composer install --no-scripts || rm -rf lib/vendor
@@ -63,6 +65,7 @@ set -e
 # install all php dependencies
 composer install --no-scripts
 echo -e "\033[0m"
+cd $DIR
 
 # configure, make and install (but skip documentation)
 make configure

gitlab/ci/template.yml

@@ -27,9 +27,9 @@
 .cached_vendor:
   extends: [.clean_ordering]
   cache:
-    key: libvendor-260522
+    key: webappvendor-20240623
     paths:
-      - lib/vendor/
+      - webapp/vendor/
 
 .mysql_job:
   script:

gitlab/unit-tests.sh

@@ -20,7 +20,7 @@ echo "UPDATE user SET teamid = 1 WHERE userid = 1;" | mysql domjudge_test
 cp webapp/.env.test /opt/domjudge/domserver/webapp/
 
 # We also need the composer.json for PHPunit to detect the correct directory.
-cp composer.json /opt/domjudge/domserver/
+cp webapp/composer.json /opt/domjudge/domserver/
 
 cd /opt/domjudge/domserver