File tree Expand file tree Collapse file tree 2 files changed +8
-2
lines changed
Expand file tree Collapse file tree 2 files changed +8
-2
lines changed Original file line number Diff line number Diff line change 1+ GNUmakefile text eol =lf
2+ * .sh text eol =lf
Original file line number Diff line number Diff line change @@ -2,7 +2,7 @@ TEST?=$$(go list ./... |grep -v 'vendor')
22GOFMT_FILES? =$$(find . -name '*.go' |grep -v vendor )
33WEBSITE_REPO =github.com/hashicorp/terraform-website
44PKG_NAME =mysql
5- TERRAFORM_VERSION =1.11.4
5+ TERRAFORM_VERSION =1.11.3
66TERRAFORM_OS =$(shell uname -s | tr A-Z a-z)
77TEST_USER =root
88TEST_PASSWORD =my-secret-pw
@@ -28,7 +28,11 @@ testversion%:
2828 $(MAKE ) MYSQL_VERSION=$* MYSQL_PORT=33$(shell echo "$* " | tr -d '.') testversion
2929
3030testversion :
31- -docker run --rm --name test-mysql$(MYSQL_VERSION ) -e MYSQL_ROOT_PASSWORD=" $( TEST_PASSWORD) " -d -p $(MYSQL_PORT ) :3306 mysql:$(MYSQL_VERSION )
31+ @MYSQLD_ARGS=" " ; \
32+ if [ " $$ (echo $( MYSQL_VERSION) | awk -F. '{ if ($$ 1 > 8 || ($$ 1 == 8 && $$ 2 >= 4)) print 1; else print 0 }')" -eq 1 ]; then \
33+ MYSQLD_ARGS=" mysqld --mysql-native-password=ON" ; \
34+ fi ; \
35+ docker run --rm --name test-mysql$(MYSQL_VERSION ) -e MYSQL_ROOT_PASSWORD=" $( TEST_PASSWORD) " -d -p $(MYSQL_PORT ) :3306 mysql:$(MYSQL_VERSION ) $$ MYSQLD_ARGS
3236 @echo ' Waiting for MySQL...'
3337 @while ! mysql -h 127.0.0.1 -P $(MYSQL_PORT ) -u " $( TEST_USER) " -p" $( TEST_PASSWORD) " -e ' SELECT 1' > /dev/null 2>&1 ; do printf ' .' ; sleep 1; done ; echo ; echo " Connected!"
3438 -mysql -h 127.0.0.1 -P $(MYSQL_PORT ) -u " $( TEST_USER) " -p" $( TEST_PASSWORD) " -e " INSTALL PLUGIN mysql_no_login SONAME 'mysql_no_login.so';"
You can’t perform that action at this time.
0 commit comments