From 324d38d4d8ccfa147aace6b06fb3e57514256859 Mon Sep 17 00:00:00 2001 From: as6325400 Date: Sun, 20 Oct 2024 00:21:55 +0800 Subject: [PATCH] tt --- .github/workflows/database-upgrade.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/database-upgrade.yml b/.github/workflows/database-upgrade.yml index 7481e9a89b..b7f043efdd 100644 --- a/.github/workflows/database-upgrade.yml +++ b/.github/workflows/database-upgrade.yml @@ -30,20 +30,21 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Install DOMjudge - run: .github/jobs/baseinstall.sh - - name: Wait and Import Database run: | apt-get update apt-get install -y default-mysql-client - while ! mysqladmin ping -h"sqlserver" -u"$MYSQL_USER" -p"$MYSQL_PASSWORD" --silent; do + while ! mysqladmin ping -h"sqlserver" -u"domjudge" -p"domjudge" --silent; do echo "Waiting for database connection..." sleep 2 done - mysql -hsqlserver -u"$MYSQL_USER" -p"$MYSQL_PASSWORD" domjudge < .github/jobs/old_database.sql + mysql -hsqlserver -u"domjudge" -p"domjudge" domjudge < .github/jobs/old_database.sql + + - name: Install DOMjudge + run: .github/jobs/baseinstall.sh + - name: Upgrade Database run: | @@ -51,4 +52,4 @@ jobs: - name: Check for Errors in the Upgrade run: | - mysql -hsqlserver -u"$MYSQL_USER" -p"$MYSQL_PASSWORD" -e "SHOW TABLES FROM domjudge;" \ No newline at end of file + mysql -hsqlserver -u"domjudge" -p"domjudge" -e "SHOW TABLES FROM domjudge;" \ No newline at end of file