Skip to content

Commit

Permalink
Prevent import-examples to fail
Browse files Browse the repository at this point in the history
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).
  • Loading branch information
vmcj committed Dec 5, 2024
1 parent c64cd3a commit 95161dd
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 1 deletion.
1 change: 1 addition & 0 deletions .github/jobs/baseinstall.sh
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +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"
echo "unused:sqlserver:domjudge:domjudge:domjudge:3306" > /opt/domjudge/domserver/etc/dbpasswords.secret
mysql_user "SELECT CURRENT_USER();"
mysql_user "SELECT USER();"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/chroot-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

jobs:
check-chroot-arch:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
container:
image: domjudge/gitlabci:24.04
options: --privileged --cgroupns=host --init
Expand Down
10 changes: 10 additions & 0 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ jobs:
cat /proc/cpuinfo
- name: pstree
run: pstree -p
- run: apt update; apt install -y docker.io
- name: Install DOMjudge
run: .github/jobs/baseinstall.sh all
- name: Set up chroot
Expand Down Expand Up @@ -88,6 +89,13 @@ jobs:
with:
name: DB-dump
path: /tmp/db.sql
- name: Get SQL logs
run: docker logs "${{ job.services.sqlserver.id }}"
- name: Collect docker logs on failure
if: ${{ !cancelled() }}
uses: jwalton/gh-docker-logs@v1
with:
dest: '/tmp/docker-logs'
- name: Upload all logs/artifacts
if: ${{ !cancelled() }}
uses: actions/upload-artifact@v4
Expand All @@ -96,6 +104,8 @@ jobs:
path: |
/var/log/nginx
/opt/domjudge/domserver/webapp/var/log/*.log
/tmp/docker-logs
/tmp/artifacts
- name: Verifying submissions
shell: bash
run: |
Expand Down

0 comments on commit 95161dd

Please sign in to comment.