Skip to content

Commit a2f7ea8

Browse files
committed
Update TiDB test matrix to latest versions and add TiUP updates
- Update TiDB versions to latest of each minor series: - 6.1.0 → 6.1.7 (latest 6.1.x) - 6.5.3 → 6.5.12 (latest 6.5.x) - 7.1.5 → 7.1.6 (latest 7.1.x) - 7.5.7 → stays (already latest 7.5.x) - 8.1.0 → 8.1.2 (latest 8.1.x) - 8.5.3 → stays (already latest 8.5.x) - Add TiUP update steps to ensure latest playground component: - Update TiUP and playground in GitHub Actions workflow - Update TiUP and playground in tidb-playground.sh script This ensures we test against the latest patch releases with bug fixes and improvements, and use the latest TiUP playground features.
1 parent bc1a94e commit a2f7ea8

File tree

3 files changed

+27
-8
lines changed

3 files changed

+27
-8
lines changed

.github/workflows/main.yml

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ on:
88
branches: [ "*" ]
99

1010
# TiDB versions used in tests - single source of truth
11+
# Latest version of each minor series: 6.1.x, 6.5.x, 7.1.x, 7.5.x, 8.1.x, 8.5.x
1112
env:
12-
TIDB_VERSIONS: "6.1.0 6.5.3 7.1.5 7.5.7 8.1.0 8.5.3"
13+
TIDB_VERSIONS: "6.1.7 6.5.12 7.1.6 7.5.7 8.1.2 8.5.3"
1314

1415
jobs:
1516
lint:
@@ -90,6 +91,12 @@ jobs:
9091
fi
9192
echo "$HOME/.tiup/bin" >> $GITHUB_PATH
9293
94+
- name: Update TiUP and playground component
95+
run: |
96+
export PATH=$HOME/.tiup/bin:$PATH
97+
tiup update --self || true
98+
tiup update playground || true
99+
93100
- name: Pre-download TiDB versions
94101
run: |
95102
export PATH=$HOME/.tiup/bin:$PATH
@@ -134,13 +141,13 @@ jobs:
134141
- testmariadb10.8
135142
- testmariadb10.10
136143
# Track https://github.com/pingcap/tidb/tags
137-
# TiDB versions must match env.TIDB_VERSIONS: 6.1.0 6.5.3 7.1.5 7.5.7 8.1.0 8.5.3
138-
- testtidb6.1.0
139-
- testtidb6.5.3
140-
# - testtidb6.5.10
141-
- testtidb7.1.5
144+
# 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
145+
# Latest version of each minor series
146+
- testtidb6.1.7
147+
- testtidb6.5.12
148+
- testtidb7.1.6
142149
- testtidb7.5.7
143-
- testtidb8.1.0
150+
- testtidb8.1.2
144151
- testtidb8.5.3
145152
steps:
146153
- name: Checkout Git repo
@@ -201,6 +208,13 @@ jobs:
201208
echo "$HOME/.tiup/bin" >> $GITHUB_PATH
202209
fi
203210
211+
- name: Update TiUP and playground component
212+
if: contains(matrix.target, 'tidb')
213+
run: |
214+
export PATH=$HOME/.tiup/bin:$PATH
215+
tiup update --self || true
216+
tiup update playground || true
217+
204218
- name: Run tests {{ matrix.target }}
205219
env:
206220
GOFLAGS: -mod=vendor

GNUmakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ bin/terraform:
4949
testacc: fmtcheck bin/terraform
5050
PATH="$(CURDIR)/bin:${PATH}" TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout=90s
5151

52-
acceptance: testversion5.6 testversion5.7 testversion8.0 testpercona5.7 testpercona8.0 testmariadb10.3 testmariadb10.8 testmariadb10.10 testtidb6.1.0 testtidb7.5.2
52+
acceptance: testversion5.6 testversion5.7 testversion8.0 testpercona5.7 testpercona8.0 testmariadb10.3 testmariadb10.8 testmariadb10.10 testtidb6.1.7 testtidb6.5.12 testtidb7.1.6 testtidb7.5.7 testtidb8.1.2 testtidb8.5.3
5353

5454
testversion%:
5555
$(MAKE) MYSQL_VERSION=$* MYSQL_PORT=33$(shell echo "$*" | tr -d '.') testversion

scripts/tidb-playground.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@ if ! command -v tiup &> /dev/null; then
1616
echo "TiUP not found. Installing..."
1717
curl --proto '=https' --tlsv1.2 -sSf https://tiup-mirrors.pingcap.com/install.sh | sh
1818
export PATH=$HOME/.tiup/bin:$PATH
19+
else
20+
# Update TiUP and playground component to ensure latest version
21+
echo "Updating TiUP and playground component..."
22+
tiup update --self || true
23+
tiup update playground || true
1924
fi
2025

2126
if [ "$MODE" = "start" ]; then

0 commit comments

Comments
 (0)