@@ -103,49 +103,49 @@ jobs:
103103 # MySQL versions
104104 - db_type : mysql
105105 db_version : " 5.6"
106- docker_image : " mysql:5 .6"
106+ make_target : " testversion5 .6"
107107 - db_type : mysql
108108 db_version : " 5.7"
109- docker_image : " mysql:5 .7"
109+ make_target : " testversion5 .7"
110110 - db_type : mysql
111111 db_version : " 8.0"
112- docker_image : " mysql:8 .0"
112+ make_target : " testversion8 .0"
113113 # Percona versions
114114 - db_type : percona
115115 db_version : " 5.7"
116- docker_image : " percona:5 .7"
116+ make_target : " testpercona5 .7"
117117 - db_type : percona
118118 db_version : " 8.0"
119- docker_image : " percona:8 .0"
119+ make_target : " testpercona8 .0"
120120 # MariaDB versions
121121 - db_type : mariadb
122122 db_version : " 10.3"
123- docker_image : " mariadb:10 .3"
123+ make_target : " testmariadb10 .3"
124124 - db_type : mariadb
125125 db_version : " 10.8"
126- docker_image : " mariadb:10 .8"
126+ make_target : " testmariadb10 .8"
127127 - db_type : mariadb
128128 db_version : " 10.10"
129- docker_image : " mariadb:10 .10"
129+ make_target : " testmariadb10 .10"
130130 # TiDB versions - must match env.TIDB_VERSIONS: 6.1.7 6.5.12 7.1.6 7.5.7 8.1.2 8.5.3
131131 - db_type : tidb
132132 db_version : " 6.1.7"
133- docker_image : " tidb:6 .1.7"
133+ make_target : " testtidb6 .1.7"
134134 - db_type : tidb
135135 db_version : " 6.5.12"
136- docker_image : " tidb:6 .5.12"
136+ make_target : " testtidb6 .5.12"
137137 - db_type : tidb
138138 db_version : " 7.1.6"
139- docker_image : " tidb:7 .1.6"
139+ make_target : " testtidb7 .1.6"
140140 - db_type : tidb
141141 db_version : " 7.5.7"
142- docker_image : " tidb:7 .5.7"
142+ make_target : " testtidb7 .5.7"
143143 - db_type : tidb
144144 db_version : " 8.1.2"
145- docker_image : " tidb:8 .1.2"
145+ make_target : " testtidb8 .1.2"
146146 - db_type : tidb
147147 db_version : " 8.5.3"
148- docker_image : " tidb:8 .5.3"
148+ make_target : " testtidb8 .5.3"
149149 steps :
150150 - name : Checkout Git repo
151151 uses : actions/checkout@v4
@@ -175,21 +175,15 @@ jobs:
175175 # Note: Docker Buildx not needed - testcontainers handles Docker directly
176176 # Skipping Buildx prevents unnecessary image pulls during initialization
177177
178- - name : Run testcontainers tests
178+ - name : Run testcontainers tests via Makefile
179179 env :
180180 GOFLAGS : -mod=vendor
181181 TF_ACC : 1
182182 GOTOOLCHAIN : auto
183- DOCKER_IMAGE : ${{ matrix.docker_image }}
184183 run : |
185184 export PATH="${{ github.workspace }}/bin:$PATH"
186- # Validate DOCKER_IMAGE is set for all test types
187- if [ -z "$DOCKER_IMAGE" ]; then
188- echo "ERROR: DOCKER_IMAGE is not set for ${{ matrix.db_type }} test"
189- exit 1
190- fi
191- echo "Running ${{ matrix.db_type }} tests with Docker image: $DOCKER_IMAGE"
192- go test -tags=testcontainers -v ./mysql/... -run WithTestcontainers -timeout=30m
185+ echo "Running ${{ matrix.db_type }} ${{ matrix.db_version }} tests using Makefile target: ${{ matrix.make_target }}"
186+ make ${{ matrix.make_target }}
193187 release :
194188 name : Release
195189 needs : [tests]
0 commit comments