Stash the first part

Author: Michael Vasseur

.github/jobs/baseinstall.sh

@@ -5,6 +5,12 @@
 export version="$1"
 db=${2:-install}
 
+# If this script is called from unit.sh, we use the test environment
+export APP_ENV="${3:-prod}"
+
+# In the test environment, we need to use a different database
+[ "$APP_ENV" = "prod" ] && DATABASE_NAME=domjudge || DATABASE_NAME=domjudge_test
+
 set -eux
 
 PHPVERSION=$(php -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION."\n";')

.github/jobs/unit-tests.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. gitlab/ci_settings.sh
+. .github/jobs/ci_settings.sh
 
 export version=$1
 unittest=$2
@@ -10,7 +10,8 @@ show_phpinfo $version
 
 # Set up
 export unit=1
-"$( dirname "${BASH_SOURCE[0]}" )"/base.sh test
+
+"$( dirname "${BASH_SOURCE[0]}" )"/baseinstall.sh else_domserver_only install test
 
 # Add team to admin user
 echo "UPDATE user SET teamid = 1 WHERE userid = 1;" | mysql domjudge_test
@@ -32,14 +33,14 @@ if [ "$CODECOVERAGE" -eq 1 ]; then
     pcov="--coverage-html=${CI_PROJECT_DIR}/coverage-html --coverage-clover coverage.xml"
 fi
 set +e
-php $phpcov webapp/bin/phpunit -c webapp/phpunit.xml.dist webapp/tests/$unittest --log-junit ${CI_PROJECT_DIR}/unit-tests.xml --colors=never $pcov > "$GITLABARTIFACTS"/phpunit.out
+php $phpcov webapp/bin/phpunit -c webapp/phpunit.xml.dist webapp/tests/$unittest --log-junit ${CI_PROJECT_DIR}/unit-tests.xml --colors=never $pcov > "$ARTIFACTS"/phpunit.out
 UNITSUCCESS=$?
 set -e
 CNT=0
 if [ $CODECOVERAGE -eq 1 ]; then
-    CNT=$(sed -n '/Generating code coverage report/,$p' "$GITLABARTIFACTS"/phpunit.out | grep -v DoctrineTestBundle | grep -cv ^$)
+    CNT=$(sed -n '/Generating code coverage report/,$p' "$ARTIFACTS"/phpunit.out | grep -v DoctrineTestBundle | grep -cv ^$)
     FILE=deprecation.txt
-    sed -n '/Generating code coverage report/,$p' "$GITLABARTIFACTS"/phpunit.out > ${CI_PROJECT_DIR}/$FILE
+    sed -n '/Generating code coverage report/,$p' "$ARTIFACTS"/phpunit.out > ${CI_PROJECT_DIR}/$FILE
     if [ $CNT -le 32 ]; then
         STATE=success
     else
@@ -59,7 +60,7 @@ if [ $UNITSUCCESS -eq 0 ]; then
 else
     STATE=failure
 fi
-cp webapp/var/log/test.log "$GITLABARTIFACTS"/test.log
+cp webapp/var/log/test.log "$ARTIFACTS"/test.log
 
 curl https://api.github.com/repos/domjudge/domjudge/statuses/$CI_COMMIT_SHA \
     -X POST \

.github/workflows/unit-tests.yml

@@ -1,4 +1,5 @@
 name: Unit tests
+# We can speedup with: https://github.com/actions/cache
 on:
   merge_group:
   pull_request:
@@ -7,25 +8,41 @@ on:
       - '[0-9]+.[0-9]+'
 
 jobs:
-  check-static-codecov:
+  unit-tests:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        PHPVERSION: 8.1
+        TEST: UNIT
+    services:
+      sqlserver:
+        image: mariadb
+        ports:
+          - 3306:3306
+        env:
+          MYSQL_ROOT_PASSWORD: password
+        options: --health-cmd="healthcheck.sh --connect --innodb_initialized" --health-interval=10s --health-timeout=5s --health-retries=3
     steps:
       - uses: actions/checkout@v4
-      - name: Download latest codecov upload script
-        run: wget https://codecov.io/bash -O newcodecov
-      - name: Detect changes to manually verify
-        run: diff newcodecov .github/jobs/uploadcodecov.sh
+      - name: Run the unit tests
+        run: .github/jobs/unit-tests.sh ${{ matrix.PHPVERSION }} ${{ matrix.TEST }}
+        #- name: Download latest codecov upload script
+        #  run: wget https://codecov.io/bash -O newcodecov
+        #- name: Detect changes to manually verify
+        #  run: diff newcodecov .github/jobs/uploadcodecov.sh
+        #- name: Publish Test Results
+        #  uses: EnricoMi/publish-unit-test-result-action@v2
+        #  if: always()
+        #  with:
+        #    files: |
+        #      test-results/**/*.xml
+      - name: Upload artifact for debugging
+        uses: actions/upload-artifact@v3
+        with:
+          name: unit-test-output
+          path: /tmp/artifacts
 
 #.unit_job:
-#  extends: [.normal_job,.cached_vendor]
-#  stage: unit
-#  # Disabled for now as it drastically speeds up running unit tests and we don't use it yet
-#  # before_script:
-#  #   - apt-get update -yqq
-#  #   - apt-get install php-xdebug -yqq
-#  variables:
-#    MYSQL_ROOT_PASSWORD: password
-#    MARIADB_PORT_3306_TCP_ADDR: sqlserver
 #  script:
 #    - set -eux
 #    - if [ -z ${PHPVERSION+x} ]; then export PHPVERSION=8.1; fi