Skip to content

Commit 6db406d

Browse files
committed
Use mysql credentials from ~/.my.cnf
1 parent 9508de4 commit 6db406d

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.github/jobs/baseinstall.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,11 @@ section_end
9292

9393
if [ "${db}" = "install" ]; then
9494
section_start "Install DOMjudge database"
95-
/opt/domjudge/domserver/bin/dj_setup_database -uroot -p${MYSQL_ROOT_PASSWORD} bare-install
95+
/opt/domjudge/domserver/bin/dj_setup_database bare-install
9696
section_end
9797
elif [ "${db}" = "upgrade" ]; then
9898
section_start "Upgrade DOMjudge database"
99-
/opt/domjudge/domserver/bin/dj_setup_database -uroot -p${MYSQL_ROOT_PASSWORD} upgrade
99+
/opt/domjudge/domserver/bin/dj_setup_database upgrade
100100
section_end
101101
fi
102102

@@ -138,7 +138,7 @@ if [ "${db}" = "install" ]; then
138138
# Make sure admin has no team associated so we will not insert submissions during unit tests.
139139
mysql_log "UPDATE user SET teamid=null WHERE userid=1;" $DATABASE_NAME
140140
fi
141-
/opt/domjudge/domserver/bin/dj_setup_database -uroot -p${MYSQL_ROOT_PASSWORD} install-examples | tee -a "$ARTIFACTS/mysql.txt"
141+
/opt/domjudge/domserver/bin/dj_setup_database install-examples | tee -a "$ARTIFACTS/mysql.txt"
142142
section_end
143143
fi
144144

.github/jobs/ci_settings.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ section_end_internal () {
2626

2727
mysql_log () {
2828
# shellcheck disable=SC2086
29-
echo "$1" | mysql -uroot -p${MYSQL_ROOT_PASSWORD} ${2:-} | tee -a "$ARTIFACTS"/mysql.txt
29+
echo "$1" | mysql ${2:-} | tee -a "$ARTIFACTS"/mysql.txt
3030
}
3131

3232
show_phpinfo() {

.github/workflows/integration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ jobs:
9595
done
9696
- name: dump the db
9797
if: ${{ !cancelled() }}
98-
run: mysqldump -uroot -pmysql_root_password --quick --max_allowed_packet=1024M domjudge > /tmp/db.sql
98+
run: mysqldump --quick --max_allowed_packet=1024M domjudge > /tmp/db.sql
9999
- name: Upload database dump for debugging
100100
if: ${{ !cancelled() }}
101101
uses: actions/upload-artifact@v4

0 commit comments

Comments
 (0)