Unbreak rejudgingpage

.github/jobs/baseinstall.sh

@@ -64,7 +64,7 @@ mysql_root "show databases"
 mysql_root "SELECT CURRENT_USER();"
 mysql_root "SELECT USER();"
 mysql_root "SELECT user,host FROM mysql.user"
-mysql_root "SET max_allowed_packet=1073741824"
+mysql_root "SET GLOBAL max_allowed_packet=1073741824"
 echo "unused:sqlserver:domjudge:domjudge:domjudge:3306" > /opt/domjudge/domserver/etc/dbpasswords.secret
 mysql_user "SELECT CURRENT_USER();"
 mysql_user "SELECT USER();"

.github/workflows/integration.yml

@@ -81,10 +81,10 @@ jobs:
           done
       - name: dump the db
         if: ${{ !cancelled() }}
-        run: mysqldump -uroot -proot domjudge > /tmp/db.sql
+        run: mysqldump -uroot -proot --quick --max_allowed_packet=1024M domjudge > /tmp/db.sql
       - name: Upload database dump for debugging
         if: ${{ !cancelled() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: DB-dump
           path: /tmp/db.sql
@@ -141,10 +141,10 @@ jobs:
           curl $CURLOPTS http://localhost/domjudge/jury/contests/1/freeze/doNow || true
           curl $CURLOPTS http://localhost/domjudge/jury/contests/1/end/doNow || true
           curl $CURLOPTS -X POST -d 'finalize_contest[b]=0&finalize_contest[finalizecomment]=gitlab&finalize_contest[finalize]=' http://localhost/domjudge/jury/contests/1/finalize
-      - name: Verify no errors in prod.log
+      - name: Verify no errors in symfony {prod,test,dev}.log
         shell: bash
         run: |
-          if cat /opt/domjudge/domserver/webapp/var/log/prod.log | egrep '(CRITICAL|ERROR):'; then
+          if cat /opt/domjudge/domserver/webapp/var/log/*.log | egrep '(CRITICAL|ERROR):'; then
              exit 1
           fi
       - name: Download and perform API check

webapp/src/Form/Type/RejudgingType.php

@@ -8,7 +8,7 @@
 use App\Entity\Problem;
 use App\Entity\Team;
 use App\Entity\User;
-use App\Service\DOMJudgeService;
+use App\Service\ConfigurationService;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
@@ -25,7 +25,7 @@
 
 class RejudgingType extends AbstractType
 {
-    public function __construct(protected readonly DOMJudgeService $dj, protected readonly EntityManagerInterface $em)
+    public function __construct(protected readonly ConfigurationService $config, protected readonly EntityManagerInterface $em)
     {
     }
 

webapp/tests/Unit/Service/ConfigurationServiceTest.php

@@ -332,8 +332,7 @@ public function provideAddOptionsExecutables(): Generator
     public function testAddOptionsResults(string $item): void
     {
         $verdictOptions = ['' => ''];
-        $verdictsConfig      = self::getContainer()->getParameter('domjudge.etcdir') . '/verdicts.php';
-        $verdicts            = include $verdictsConfig;
+        $verdicts = $this->config->getVerdicts(['final']);
         foreach (array_keys($verdicts) as $verdict) {
             $verdictOptions[$verdict] = $verdict;
         }