Skip to content

Commit 95161dd

Browse files
committed
Prevent import-examples to fail
The mariadb images seems to now allow a smaller maximum packet by default. This resulted in problems for the boolfind problem which we didn't detect as all checks would still pass correctly. We now also capture the SQL logs to detect this easier and increase the maximum packetsize (1G).
1 parent c64cd3a commit 95161dd

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

.github/jobs/baseinstall.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ mysql_root "show databases"
6464
mysql_root "SELECT CURRENT_USER();"
6565
mysql_root "SELECT USER();"
6666
mysql_root "SELECT user,host FROM mysql.user"
67+
mysql_root "SET max_allowed_packet=1073741824"
6768
echo "unused:sqlserver:domjudge:domjudge:domjudge:3306" > /opt/domjudge/domserver/etc/dbpasswords.secret
6869
mysql_user "SELECT CURRENT_USER();"
6970
mysql_user "SELECT USER();"

.github/workflows/chroot-checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
check-chroot-arch:
11-
runs-on: ubuntu-latest
11+
runs-on: ubuntu-24.04
1212
container:
1313
image: domjudge/gitlabci:24.04
1414
options: --privileged --cgroupns=host --init

.github/workflows/integration.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ jobs:
3636
cat /proc/cpuinfo
3737
- name: pstree
3838
run: pstree -p
39+
- run: apt update; apt install -y docker.io
3940
- name: Install DOMjudge
4041
run: .github/jobs/baseinstall.sh all
4142
- name: Set up chroot
@@ -88,6 +89,13 @@ jobs:
8889
with:
8990
name: DB-dump
9091
path: /tmp/db.sql
92+
- name: Get SQL logs
93+
run: docker logs "${{ job.services.sqlserver.id }}"
94+
- name: Collect docker logs on failure
95+
if: ${{ !cancelled() }}
96+
uses: jwalton/gh-docker-logs@v1
97+
with:
98+
dest: '/tmp/docker-logs'
9199
- name: Upload all logs/artifacts
92100
if: ${{ !cancelled() }}
93101
uses: actions/upload-artifact@v4
@@ -96,6 +104,8 @@ jobs:
96104
path: |
97105
/var/log/nginx
98106
/opt/domjudge/domserver/webapp/var/log/*.log
107+
/tmp/docker-logs
108+
/tmp/artifacts
99109
- name: Verifying submissions
100110
shell: bash
101111
run: |

0 commit comments

Comments
 (0)