Skip to content

Commit d3e2924

Browse files
abetomoabetomo
authored
Drop support for MySQL 5.7 (#84)
We also tidied up the conditions for docker push with CI.
1 parent 2c616fd commit d3e2924

File tree

6 files changed

+45
-87
lines changed

6 files changed

+45
-87
lines changed

‎.github/workflows/build.yml

+15-20
Original file line numberDiff line numberDiff line change
@@ -18,39 +18,34 @@ jobs:
1818
matrix:
1919
id:
2020
- "mysql-8.0"
21-
- "mysql-5.7"
2221
steps:
2322
- name: Parse ID
2423
id: parse
2524
run: |
2625
set -x
26+
if [ "${GITHUB_REF_TYPE}" = "tag" ] && [[ "${GITHUB_REF_NAME}" =~ ^${{ matrix.id }}\. ]]; then
27+
version="${GITHUB_REF_NAME}"
28+
else
29+
version=${{ matrix.id }}-latest
30+
fi
31+
2732
push=false
28-
case "${{ github.ref }}" in
29-
refs/tags/*)
30-
version=$(echo "${{ github.ref }}" | sed -e "s,^refs/tags/,,g")
31-
case "${version}" in
32-
${{ matrix.id }}.*)
33-
push=true
34-
;;
35-
*)
36-
version=${{ matrix.id }}-latest
37-
push=false
38-
;;
39-
esac
40-
;;
41-
*)
42-
version=${{ matrix.id }}-latest
43-
push=true
44-
;;
45-
esac
33+
if [ "${GITHUB_EVENT_NAME}" = "push" ]; then
34+
push=true
35+
if [ "${GITHUB_REF_TYPE}" = "tag" ] && [ "${version}" != "${GITHUB_REF_NAME}" ]; then
36+
push=false
37+
fi
38+
fi
39+
4640
tags="groonga/mroonga:${version}"
47-
if [ "${version}" = "mysql-5.7-latest" ]; then
41+
if [ "${version}" = "mysql-8.0-latest" ]; then
4842
tags="${tags},groonga/mroonga:latest"
4943
fi
5044
echo "::set-output name=push::${push}"
5145
echo "::set-output name=tags::${tags}"
5246
- uses: actions/checkout@v4
5347
- uses: docker/login-action@v3
48+
if: steps.parse.outputs.push == 'true'
5449
with:
5550
username: ${{ secrets.DOCKER_HUB_USERNAME }}
5651
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}

‎README.md

+28-26
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,36 @@ If your /path/to/datadir doesn't have ibdata1, container decides to re-initializ
3131
Currently, groonga/mroonga provides these couples of versions.
3232
([tags](https://hub.docker.com/r/groonga/mroonga/tags/) cannot display all of them..)
3333

34+
### For MySQL 8.0
35+
36+
| tag | MySQL | Mroonga | Groonga |
37+
|------------------------|--------|---------|---------|
38+
| mysql-8.0-latest | 8.0.30 | 12.06 | 12.0.6 |
39+
| mysql-8.0.30-12.06 | 8.0.30 | 12.06 | 12.0.6 |
40+
| mysql-8.0.29-12.04 | 8.0.29 | 12.04 | 12.0.4 |
41+
| mysql-8.0.29-12.03 | 8.0.29 | 12.03 | 12.0.3 |
42+
| mysql-8.0.28-12.02 | 8.0.28 | 12.02 | 12.0.2 |
43+
| mysql-8.0.28-12.00 | 8.0.28 | 12.00 | 12.0.0 |
44+
| mysql-8.0.28-11.13 | 8.0.28 | 11.13 | 11.1.3 |
45+
| mysql-8.0.27-11.13 | 8.0.27 | 11.13 | 11.1.3 |
46+
| mysql-8.0.25-11.03 | 8.0.25 | 11.03 | 11.0.3 |
47+
| mysql8025\_mroonga1103 | 8.0.25 | 11.03 | 11.0.3 |
48+
| mysql8025\_mroonga1102 | 8.0.25 | 11.02 | 11.0.2 |
49+
| mysql8023\_mroonga1101 | 8.0.23 | 11.01 | 11.0.1 |
50+
| mysql8023\_mroonga1100 | 8.0.23 | 11.00 | 11.0.0 |
51+
| mysql8023\_mroonga1011 | 8.0.23 | 10.11 | 10.1.1 |
52+
| mysql8022\_mroonga1010 | 8.0.22 | 10.10 | 10.1.0 |
53+
| mysql8019\_mroonga1001 | 8.0.19 | 10.01 | 10.0.1 |
54+
| mysql8019\_mroonga912 | 8.0.18 | 9.12 | 9.1.2 |
55+
| mysql8018\_mroonga909 | 8.0.18 | 9.09 | 9.0.9 |
56+
| mysql8017\_mroonga907 | 8.0.17 | 9.07 | 9.0.7 |
57+
| mysql8017\_mroonga905 | 8.0.17 | 9.05 | 9.0.5 |
58+
| mysql8016\_mroonga904 | 8.0.16 | 9.04 | 9.0.4 |
59+
3460
### For MySQL 5.7
3561

62+
EOL
63+
3664
| tag | MySQL | Mroonga | Groonga |
3765
|--------------------------|--------|---------|---------|
3866
| mysql-5.7-latest, latest | 5.7.39 | 12.06 | 12.0.6 |
@@ -95,32 +123,6 @@ Currently, groonga/mroonga provides these couples of versions.
95123
| mysql5710\_mroonga510 | 5.7.10 | 5.10 | 5.1.0 |
96124
| mysql579\_mroonga509 | 5.7.9 | 5.09 | 5.0.9 |
97125

98-
### For MySQL 8.0
99-
100-
| tag | MySQL | Mroonga | Groonga |
101-
|------------------------|--------|---------|---------|
102-
| mysql-8.0-latest | 8.0.30 | 12.06 | 12.0.6 |
103-
| mysql-8.0.30-12.06 | 8.0.30 | 12.06 | 12.0.6 |
104-
| mysql-8.0.29-12.04 | 8.0.29 | 12.04 | 12.0.4 |
105-
| mysql-8.0.29-12.03 | 8.0.29 | 12.03 | 12.0.3 |
106-
| mysql-8.0.28-12.02 | 8.0.28 | 12.02 | 12.0.2 |
107-
| mysql-8.0.28-12.00 | 8.0.28 | 12.00 | 12.0.0 |
108-
| mysql-8.0.28-11.13 | 8.0.28 | 11.13 | 11.1.3 |
109-
| mysql-8.0.27-11.13 | 8.0.27 | 11.13 | 11.1.3 |
110-
| mysql-8.0.25-11.03 | 8.0.25 | 11.03 | 11.0.3 |
111-
| mysql8025\_mroonga1103 | 8.0.25 | 11.03 | 11.0.3 |
112-
| mysql8025\_mroonga1102 | 8.0.25 | 11.02 | 11.0.2 |
113-
| mysql8023\_mroonga1101 | 8.0.23 | 11.01 | 11.0.1 |
114-
| mysql8023\_mroonga1100 | 8.0.23 | 11.00 | 11.0.0 |
115-
| mysql8023\_mroonga1011 | 8.0.23 | 10.11 | 10.1.1 |
116-
| mysql8022\_mroonga1010 | 8.0.22 | 10.10 | 10.1.0 |
117-
| mysql8019\_mroonga1001 | 8.0.19 | 10.01 | 10.0.1 |
118-
| mysql8019\_mroonga912 | 8.0.18 | 9.12 | 9.1.2 |
119-
| mysql8018\_mroonga909 | 8.0.18 | 9.09 | 9.0.9 |
120-
| mysql8017\_mroonga907 | 8.0.17 | 9.07 | 9.0.7 |
121-
| mysql8017\_mroonga905 | 8.0.17 | 9.05 | 9.0.5 |
122-
| mysql8016\_mroonga904 | 8.0.16 | 9.04 | 9.0.4 |
123-
124126
### For MySQL 5.6
125127

126128
EOL

‎mysql-5.7/Dockerfile

-34
This file was deleted.

‎mysql-5.7/mysqld.cnf

-2
This file was deleted.

‎test/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -eu
44

55
if [ $# != 1 ]; then
66
echo "Usage: $0 CONTEXT"
7-
echo " e.g.: $0 mysql-5.7"
7+
echo " e.g.: $0 mysql-8.0"
88
exit 1
99
fi
1010

‎update.sh

+1-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -eu
44

55
if [ $# != 3 ]; then
66
echo "Usage: $0 MYSQL_VERSION MROONGA_VERSION GROONGA_VERSION"
7-
echo " e.g.: $0 5.7.26 9.01 9.0.2"
7+
echo " e.g.: $0 8.0.30 12.06 12.0.6"
88
exit 1
99
fi
1010

@@ -19,9 +19,6 @@ else
1919
fi
2020

2121
case $mysql_version in
22-
5.7.*)
23-
docker_file=mysql-5.7/Dockerfile
24-
;;
2522
8.0.*)
2623
docker_file=mysql-8.0/Dockerfile
2724
;;

0 commit comments

Comments
 (0)