ttttt

.github/workflows/database-upgrade.yml

@@ -12,9 +12,10 @@ on:
       - '[0-9]+.[0-9]+'
 
 jobs:
-  upgrade-test:
+  upgrade_test:
     runs-on: ubuntu-latest
-
+    container:
+      image: domjudge/gitlabci:24.04
     services:
       sqlserver:
         image: mariadb
@@ -24,33 +25,33 @@ jobs:
           MYSQL_ROOT_PASSWORD: root
           MYSQL_USER: domjudge
           MYSQL_PASSWORD: domjudge
-        options: --health-cmd="mysqladmin ping --silent" --health-interval=10s --health-timeout=5s --health-retries=3
-
+        options: >-
+          --health-cmd="healthcheck.sh --connect --innodb_initialized"
+          --health-interval=10s
+          --health-timeout=5s
+          --health-retries=3
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+
+      - name: Install DOMjudge
+        run: .github/jobs/baseinstall.sh
 
-      # 等待 MariaDB 服務啟動
       - name: Wait for SQL Server to be ready
         run: sleep 20
 
-      # 將 .sql 文件導入 MariaDB，這裡可以是老版本的資料庫
-      - name: Import old_database.sql into MariaDB
+      - name: Import olddata into MariaDB
         run: |
-          docker exec -i sqlserver mysql -h127.0.0.1 -udomjudge -pdomjudge domjudge < .github/jobs/old_database.sql
+          docker exec -i sqlserver mysql -h127.0.0.1 -u${{ env.MYSQL_USER }} -p${{ env.MYSQL_PASSWORD }} domjudge < .github/jobs/old_database.sql
 
-      # 升級資料庫
       - name: Upgrade Database
         run: |
-          docker exec -i domserver /opt/domjudge/domserver/bin/dj_setup_database upgrade
+          docker exec domserver /opt/domjudge/domserver/bin/dj_setup_database upgrade
 
-      # 檢查升級後資料庫是否有錯誤
       - name: Check for Errors in the Upgrade
         run: |
-          docker exec -i sqlserver mysql -uroot -proot -e "SHOW TABLES IN domjudge;"
+          docker exec sqlserver mysql -uroot -proot -e "SHOW TABLES IN domjudge;"
 
-      # 清理容器
       - name: Clean up
         run: |
-          docker stop domserver
-          docker rm domserver
+          docker stop domserver sqlserver
+          docker rm domserver sqlserver