Skip to content

Commit d28b53e

Browse files
committed
CI: Update to latest stable MySQL, PostgreSQL
Signed-off-by: Stephen Finucane <stephen@that.guru>
1 parent 60f8be6 commit d28b53e

3 files changed

Lines changed: 14 additions & 9 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
MYSQL_ROOT_PASSWORD: root-${{ github.run_id }}
4848
services:
4949
postgres:
50-
image: postgres:17
50+
image: postgres:18
5151
env:
5252
POSTGRES_DB: ${{ env.DATABASE_NAME }}
5353
POSTGRES_PASSWORD: ${{ env.DATABASE_PASSWORD }}
@@ -60,7 +60,7 @@ jobs:
6060
--health-timeout 5s
6161
--health-retries 5
6262
mysql:
63-
image: mysql:8.4
63+
image: mysql:9.7
6464
env:
6565
MYSQL_DATABASE: ${{ env.DATABASE_NAME }}
6666
MYSQL_USER: ${{ env.DATABASE_USER }}
@@ -98,8 +98,10 @@ jobs:
9898
- name: Modify database user permissions (mysql)
9999
if: ${{ matrix.db == 'mysql' }}
100100
run: |
101-
mysql -h 127.0.0.1 -e "GRANT ALL ON \`test\\_${DATABASE_NAME}%\`.* to '${DATABASE_USER}'@'%';" \
102-
-uroot -p${MYSQL_ROOT_PASSWORD}
101+
mysql -h 127.0.0.1 -uroot -p${MYSQL_ROOT_PASSWORD} -e \
102+
"GRANT ALL ON \`test\\_${DATABASE_NAME}%\`.* TO '${DATABASE_USER}'@'%';
103+
GRANT PROCESS, SESSION_VARIABLES_ADMIN ON *.* TO '${DATABASE_USER}'@'%';
104+
FLUSH PRIVILEGES;"
103105
- name: Run unit tests (via tox)
104106
run: tox
105107
docs:
@@ -164,8 +166,11 @@ jobs:
164166
- name: Modify database user permissions (mysql)
165167
if: ${{ matrix.db == 'mysql' }}
166168
run: |
167-
docker compose exec -T -- db \
168-
sh -c "exec mysql -uroot -p\"\${MYSQL_ROOT_PASSWORD}\" -e \"GRANT ALL ON \\\`test\\_\${MYSQL_DATABASE}%\\\`.* to '\${MYSQL_USER}'@'%'; FLUSH PRIVILEGES;\""
169+
docker compose exec -T -- db sh -c \
170+
"exec mysql -uroot -p\"\${MYSQL_ROOT_PASSWORD}\" -e \
171+
\"GRANT ALL ON \\\`test\\_\${MYSQL_DATABASE}%\\\`.* TO '\${MYSQL_USER}'@'%';
172+
GRANT PROCESS, SESSION_VARIABLES_ADMIN ON *.* TO '\${MYSQL_USER}'@'%';
173+
FLUSH PRIVILEGES;\""
169174
- name: Run unittest
170175
run: docker compose run -T --rm web tox
171176
- name: Test normal startup

docker-compose-pg.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
---
22
services:
33
db:
4-
image: postgres:17
4+
image: postgres:18
55
volumes:
6-
- ./tools/docker/db/postdata:/var/lib/postgresql/data
6+
- ./tools/docker/db/postdata:/var/lib/postgresql
77
environment:
88
- POSTGRES_DB=patchwork
99
- POSTGRES_USER=patchwork

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
services:
33
db:
4-
image: mysql:latest
4+
image: mysql:9.7
55
volumes:
66
- ./tools/docker/db/data:/var/lib/mysql
77
environment:

0 commit comments

Comments
 (0)