Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop support for MySQL 5.7 #84

Merged
merged 8 commits into from
Nov 13, 2024
Merged

Drop support for MySQL 5.7 #84

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
484e5a9
Drop support for MySQL 5.7
abetomo Nov 11, 2024
66f3314
Update GitHub Actions settings
abetomo Nov 11, 2024
871e6b7
Remove unnecessary parentheses
abetomo Nov 11, 2024
9b3e9f5
Change the condition to push
abetomo Nov 11, 2024
3f2f952
Improve conditions
abetomo Nov 11, 2024
a768883
Fix conditions
abetomo Nov 11, 2024
622f1c1
Update condition
abetomo Nov 12, 2024
b031a6f
Improve condition
abetomo Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 11 additions & 19 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,39 +18,31 @@ jobs:
matrix:
id:
- "mysql-8.0"
- "mysql-5.7"
steps:
- name: Parse ID
id: parse
run: |
set -x

push=false
case "${{ github.ref }}" in
refs/tags/*)
version=$(echo "${{ github.ref }}" | sed -e "s,^refs/tags/,,g")
case "${version}" in
${{ matrix.id }}.*)
push=true
;;
*)
version=${{ matrix.id }}-latest
push=false
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

これは維持して欲しい。

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

これをがんばらない方がいいのかな。

たぶん、タグとpushしたコミットの両方でpushするとエラーになるからこうしているんだと思うんだけど、それを無視すればいいっちゃいいんだよね。気持ち悪いけど。

;;
esac
;;
*)
version=${{ matrix.id }}-latest
if [ "${GITHUB_REF_TYPE}" = "tag" ] -a [[ "${GITHUB_REF_NAME}" =~ ^${{ matrix.id }}\. ]]; then
version="${GITHUB_REF_NAME}"
if [ "${GITHUB_EVENT_NAME}" = "push" ]; then
push=true
;;
esac
fi
else
version=${{ matrix.id }}-latest
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

タグじゃない"${GITHUB_EVENT_NAME}" = "push"のときはpush=trueして欲しい。

fi

tags="groonga/mroonga:${version}"
if [ "${version}" = "mysql-5.7-latest" ]; then
if [ "${version}" = "mysql-8.0-latest" ]; then
tags="${tags},groonga/mroonga:latest"
fi
echo "::set-output name=push::${push}"
echo "::set-output name=tags::${tags}"
- uses: actions/checkout@v4
- uses: docker/login-action@v3
if: steps.parse.outputs.push == 'true'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

GITHUB_EVENT_NAMEがpushのときだけsteps.parse.outputs.pushをtrueにしてくれる？

with:
username: ${{ secrets.DOCKER_HUB_USERNAME }}
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
Expand Down
54 changes: 28 additions & 26 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,36 @@ If your /path/to/datadir doesn't have ibdata1, container decides to re-initializ
Currently, groonga/mroonga provides these couples of versions.
([tags](https://hub.docker.com/r/groonga/mroonga/tags/) cannot display all of them..)

### For MySQL 8.0

| tag | MySQL | Mroonga | Groonga |
|------------------------|--------|---------|---------|
| mysql-8.0-latest | 8.0.30 | 12.06 | 12.0.6 |
| mysql-8.0.30-12.06 | 8.0.30 | 12.06 | 12.0.6 |
| mysql-8.0.29-12.04 | 8.0.29 | 12.04 | 12.0.4 |
| mysql-8.0.29-12.03 | 8.0.29 | 12.03 | 12.0.3 |
| mysql-8.0.28-12.02 | 8.0.28 | 12.02 | 12.0.2 |
| mysql-8.0.28-12.00 | 8.0.28 | 12.00 | 12.0.0 |
| mysql-8.0.28-11.13 | 8.0.28 | 11.13 | 11.1.3 |
| mysql-8.0.27-11.13 | 8.0.27 | 11.13 | 11.1.3 |
| mysql-8.0.25-11.03 | 8.0.25 | 11.03 | 11.0.3 |
| mysql8025\_mroonga1103 | 8.0.25 | 11.03 | 11.0.3 |
| mysql8025\_mroonga1102 | 8.0.25 | 11.02 | 11.0.2 |
| mysql8023\_mroonga1101 | 8.0.23 | 11.01 | 11.0.1 |
| mysql8023\_mroonga1100 | 8.0.23 | 11.00 | 11.0.0 |
| mysql8023\_mroonga1011 | 8.0.23 | 10.11 | 10.1.1 |
| mysql8022\_mroonga1010 | 8.0.22 | 10.10 | 10.1.0 |
| mysql8019\_mroonga1001 | 8.0.19 | 10.01 | 10.0.1 |
| mysql8019\_mroonga912 | 8.0.18 | 9.12 | 9.1.2 |
| mysql8018\_mroonga909 | 8.0.18 | 9.09 | 9.0.9 |
| mysql8017\_mroonga907 | 8.0.17 | 9.07 | 9.0.7 |
| mysql8017\_mroonga905 | 8.0.17 | 9.05 | 9.0.5 |
| mysql8016\_mroonga904 | 8.0.16 | 9.04 | 9.0.4 |

### For MySQL 5.7

EOL

| tag | MySQL | Mroonga | Groonga |
|--------------------------|--------|---------|---------|
| mysql-5.7-latest, latest | 5.7.39 | 12.06 | 12.0.6 |
Expand Down Expand Up @@ -95,32 +123,6 @@ Currently, groonga/mroonga provides these couples of versions.
| mysql5710\_mroonga510 | 5.7.10 | 5.10 | 5.1.0 |
| mysql579\_mroonga509 | 5.7.9 | 5.09 | 5.0.9 |

### For MySQL 8.0

| tag | MySQL | Mroonga | Groonga |
|------------------------|--------|---------|---------|
| mysql-8.0-latest | 8.0.30 | 12.06 | 12.0.6 |
| mysql-8.0.30-12.06 | 8.0.30 | 12.06 | 12.0.6 |
| mysql-8.0.29-12.04 | 8.0.29 | 12.04 | 12.0.4 |
| mysql-8.0.29-12.03 | 8.0.29 | 12.03 | 12.0.3 |
| mysql-8.0.28-12.02 | 8.0.28 | 12.02 | 12.0.2 |
| mysql-8.0.28-12.00 | 8.0.28 | 12.00 | 12.0.0 |
| mysql-8.0.28-11.13 | 8.0.28 | 11.13 | 11.1.3 |
| mysql-8.0.27-11.13 | 8.0.27 | 11.13 | 11.1.3 |
| mysql-8.0.25-11.03 | 8.0.25 | 11.03 | 11.0.3 |
| mysql8025\_mroonga1103 | 8.0.25 | 11.03 | 11.0.3 |
| mysql8025\_mroonga1102 | 8.0.25 | 11.02 | 11.0.2 |
| mysql8023\_mroonga1101 | 8.0.23 | 11.01 | 11.0.1 |
| mysql8023\_mroonga1100 | 8.0.23 | 11.00 | 11.0.0 |
| mysql8023\_mroonga1011 | 8.0.23 | 10.11 | 10.1.1 |
| mysql8022\_mroonga1010 | 8.0.22 | 10.10 | 10.1.0 |
| mysql8019\_mroonga1001 | 8.0.19 | 10.01 | 10.0.1 |
| mysql8019\_mroonga912 | 8.0.18 | 9.12 | 9.1.2 |
| mysql8018\_mroonga909 | 8.0.18 | 9.09 | 9.0.9 |
| mysql8017\_mroonga907 | 8.0.17 | 9.07 | 9.0.7 |
| mysql8017\_mroonga905 | 8.0.17 | 9.05 | 9.0.5 |
| mysql8016\_mroonga904 | 8.0.16 | 9.04 | 9.0.4 |

### For MySQL 5.6

EOL
Expand Down
34 changes: 0 additions & 34 deletions mysql-5.7/Dockerfile
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions mysql-5.7/mysqld.cnf
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion test/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -eu

if [ $# != 1 ]; then
echo "Usage: $0 CONTEXT"
echo " e.g.: $0 mysql-5.7"
echo " e.g.: $0 mysql-8.0"
exit 1
fi

Expand Down
5 changes: 1 addition & 4 deletions update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -eu

if [ $# != 3 ]; then
echo "Usage: $0 MYSQL_VERSION MROONGA_VERSION GROONGA_VERSION"
echo " e.g.: $0 5.7.26 9.01 9.0.2"
echo " e.g.: $0 8.0.30 12.06 12.0.6"
exit 1
fi

Expand All @@ -19,9 +19,6 @@ else
fi

case $mysql_version in
5.7.*)
docker_file=mysql-5.7/Dockerfile
;;
8.0.*)
docker_file=mysql-8.0/Dockerfile
;;
Expand Down
Loading