default

as6325400 · Oct 20, 2024 · 22915f1 · 22915f1
1 parent f298483
commit 22915f1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 126 deletions.
diff --git a/.github/jobs/baseinstall.sh b/.github/jobs/baseinstall.sh
@@ -94,10 +94,12 @@ for service in nginx php${PHPVERSION}-fpm; do
 done
 section_end
 
-if [ "${db}" = "install" ]; then
-    section_start "Install the example data"
-    /opt/domjudge/domserver/bin/dj_setup_database -uroot -proot install-examples | tee -a "$ARTIFACTS/mysql.txt"
-    section_end
+if [ "${db}" != "none" ]; then
+    if [ "${db}" = "install" ]; then
+        section_start "Install the example data"
+        /opt/domjudge/domserver/bin/dj_setup_database -uroot -proot install-examples | tee -a "$ARTIFACTS/mysql.txt"
+        section_end
+    fi
 fi
 
 section_start "Setup user"

diff --git a/.github/jobs/upgradeinstall.sh b/.github/jobs/upgradeinstall.sh
diff --git a/.github/workflows/database-upgrade.yml b/.github/workflows/database-upgrade.yml
@@ -44,7 +44,7 @@ jobs:
 
 
       - name: Install DOMjudge
-        run: .github/jobs/upgradeinstall.sh
+        run: .github/jobs/baseinstall.sh default none
 
       - name: Check for Errors in the Upgrade
         run: |