adjust ci script

kazuho · Apr 6, 2024 · e5fefa1 · e5fefa1
1 parent 232a015
commit e5fefa1
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/author/ci_install_mysql.sh b/author/ci_install_mysql.sh
@@ -9,7 +9,7 @@ if [[ $DATABASE_ADAPTER =~ (mariadb|mysql-5\.7) ]]; then
     # https://mariadb.com/kb/en/mariadb-package-repository-setup-and-usage/
     curl -LsS https://r.mariadb.com/downloads/mariadb_repo_setup | sudo bash
     sudo apt-get update -q
-    sudo apt-get install -q --yes --force-yes -f --option DPkg::Options::=--force-confnew mariadb-server libmariadb-dev
+    sudo apt-get install -q -y mariadb-server libmariadb-dev
     sudo mariadb-upgrade
   elif [[ $DATABASE_ADAPTER =~ mysql-5\.7 ]]; then
     sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 467B942D3A79BD29
@@ -22,7 +22,7 @@ EOC
     sudo dpkg --install mysql-apt-config_0.8.29-1_all.deb
     sudo apt-get update -q
     sudo apt-cache policy mysql-server
-    sudo apt-get remove -q --yes mysql-client-8.0 mysql-client-core-8.0
-    sudo apt-get install -q --yes -f mysql-client=5.7* mysql-community-server=5.7* mysql-server=5.7*
+    sudo apt-get remove -q -y mysql-client-8.0 mysql-client-core-8.0
+    sudo apt-get install -q -y mysql-client=5.7* mysql-community-server=5.7* mysql-server=5.7*
   fi
 fi