Skip to content

Commit f61c4aa

Browse files
committed
Use composer prepare-tests in gha
1 parent 6dfbd40 commit f61c4aa

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

.github/workflows/testing.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,7 @@ jobs:
141141
echo "WP_CLI_TEST_DBUSER=wp_cli_test" >> $GITHUB_ENV
142142
echo "WP_CLI_TEST_DBPASS=password1" >> $GITHUB_ENV
143143
echo "WP_CLI_TEST_DBHOST=$MYSQL_HOST:$MYSQL_TCP_PORT" >> $GITHUB_ENV
144-
mysql -e "CREATE DATABASE IF NOT EXISTS \`wp_cli_test\`;" -uroot -proot
145-
mysql -e "GRANT ALL PRIVILEGES ON \`wp_cli_test\`.* TO 'wp_cli_test'@'%' IDENTIFIED BY 'password1';" -uroot -proot
146-
mysql -e "GRANT ALL PRIVILEGES ON \`wp_cli_test_scaffold\`.* TO 'wp_cli_test'@'%' IDENTIFIED BY 'password1';" -uroot -proot
144+
composer prepare-tests
147145
148146
- name: Run Behat
149147
if: steps.check_files.outputs.files_exists == 'true'

bin/install-package-tests

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ fi
3333
install_db_8_0_plus() {
3434
mysql -e "CREATE DATABASE IF NOT EXISTS wp_cli_test;" $HOST_STRING -u"$USER" "$PASSWORD_STRING"
3535
mysql -e "CREATE USER IF NOT EXISTS wp_cli_test@$HOST IDENTIFIED BY 'password1'" $HOST_STRING -u"$USER" "$PASSWORD_STRING"
36-
mysql -e "GRANT ALL PRIVILEGES ON wp_cli_test.* TO wp_cli_test@$HOST" $HOST_STRING -u"$USER" "$PASSWORD_STRING"
37-
mysql -e "GRANT ALL PRIVILEGES ON wp_cli_test_scaffold.* TO wp_cli_test@$HOST" $HOST_STRING -u"$USER" "$PASSWORD_STRING"
36+
mysql -e "GRANT ALL PRIVILEGES ON wp_cli_test.* TO wp_cli_test@%" $HOST_STRING -u"$USER" "$PASSWORD_STRING"
37+
mysql -e "GRANT ALL PRIVILEGES ON wp_cli_test_scaffold.* TO wp_cli_test@%" $HOST_STRING -u"$USER" "$PASSWORD_STRING"
3838
}
3939

4040
# Prepare the database for running the tests with a MySQL version lower than 8.0.
4141
install_db_lower_than_8_0() {
4242
mysql -e "CREATE DATABASE IF NOT EXISTS wp_cli_test;" $HOST_STRING -u"$USER" "$PASSWORD_STRING"
43-
mysql -e "GRANT ALL ON wp_cli_test.* TO wp_cli_test@$HOST IDENTIFIED BY 'password1'" $HOST_STRING -u"$USER" "$PASSWORD_STRING"
44-
mysql -e "GRANT ALL ON wp_cli_test_scaffold.* TO wp_cli_test@$HOST IDENTIFIED BY 'password1'" $HOST_STRING -u"$USER" "$PASSWORD_STRING"
43+
mysql -e "GRANT ALL ON wp_cli_test.* TO wp_cli_test@% IDENTIFIED BY 'password1'" $HOST_STRING -u"$USER" "$PASSWORD_STRING"
44+
mysql -e "GRANT ALL ON wp_cli_test_scaffold.* TO wp_cli_test@% IDENTIFIED BY 'password1'" $HOST_STRING -u"$USER" "$PASSWORD_STRING"
4545
}
4646

4747
set -ex

0 commit comments

Comments
 (0)