up

plugins/mysql/versions/5.5/install.sh

@@ -15,10 +15,6 @@ install_tmp=${rootPath}/tmp/mw_install.pl
 mysqlDir=${serverPath}/source/mysql
 
 
-# 加快测试速度 For Github Action
-MAKEJN="${MAKEJN:--j2}"
-echo "MAKEJN:$MAKEJN"
-
 Install_mysql()
 {
 	mkdir -p ${mysqlDir}
@@ -62,7 +58,7 @@ Install_mysql()
 		-DDEFAULT_COLLATION=utf8mb4_general_ci \
 		-DCMAKE_C_COMPILER=/usr/bin/gcc \
 		-DCMAKE_CXX_COMPILER=/usr/bin/g++ \
-		&& make $MAKEJN && make install && make clean
+		&& make ${MAKEJN:--j2} && make install && make clean
 
 		if [ -d $serverPath/mysql ];then
 			echo '5.5' > $serverPath/mysql/version.pl

plugins/mysql/versions/5.6/install.sh

@@ -18,10 +18,6 @@ install_tmp=${rootPath}/tmp/mw_install.pl
 mysqlDir=${serverPath}/source/mysql
 
 
-# 加快测试速度 For Github Action
-MAKEJN="${MAKEJN:--j2}"
-echo "MAKEJN:$MAKEJN"
-
 Install_mysql()
 {
 	mkdir -p ${mysqlDir}
@@ -66,7 +62,7 @@ Install_mysql()
 		-DCMAKE_C_COMPILER=/usr/bin/gcc \
 		-DCMAKE_CXX_COMPILER=/usr/bin/g++ \
 		-DDEFAULT_COLLATION=utf8mb4_general_ci \
-		&& make $MAKEJN && make install && make clean
+		&& make ${MAKEJN:--j2} && make install && make clean
 
 
 		if [ -d $serverPath/mysql ];then

plugins/mysql/versions/5.7/install.sh

@@ -19,9 +19,6 @@ mysqlDir=${serverPath}/source/mysql
 
 VERSION="5.7.37"
 
-# 加快测试速度 For Github Action
-MAKEJN="${MAKEJN:--j2}"
-echo "MAKEJN:$MAKEJN"
 
 Install_mysql()
 {
@@ -81,7 +78,7 @@ Install_mysql()
 		-DCMAKE_C_COMPILER=/usr/bin/gcc \
 		-DCMAKE_CXX_COMPILER=/usr/bin/g++ \
 		-DWITH_BOOST=${mysqlDir}/mysql-${VERSION}/boost/
-		make $MAKEJN && make install && make clean
+		make ${MAKEJN:--j2} && make install && make clean
 		echo '5.7' > $serverPath/mysql/version.pl
 		echo '安装完成' > $install_tmp
 	fi