Skip to content

Commit 243fc1d

Browse files
SingingBushSingingBush
committed
don't run against MySQL v8 for now
1 parent b51f0dd commit 243fc1d

File tree

3 files changed

+67
-151
lines changed

3 files changed

+67
-151
lines changed

‎.github/workflows/dub.yml

Lines changed: 1 addition & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: CI
1+
name: Builds
22

33
# Overall MySQL Native should work on the last 10 minor compiler releases (same as Vibe.d).
44
# For simplicity and speed of the CI, the latest versions of dmd and ldc must are tested on
@@ -92,82 +92,3 @@ jobs:
9292
# cache
9393
- uses: WebFreak001/[email protected]
9494
with: { store: true }
95-
96-
integration-tests:
97-
name: Integration Tests ${{ matrix.compiler }}
98-
strategy:
99-
fail-fast: false
100-
matrix:
101-
compiler:
102-
- dmd-latest
103-
- ldc-latest
104-
- dmd-2.096.1
105-
- dmd-2.095.1
106-
- dmd-2.094.2
107-
- dmd-2.093.1
108-
- dmd-2.092.1
109-
- dmd-2.091.1
110-
- dmd-2.090.1
111-
- dmd-2.089.1
112-
- dmd-2.088.1
113-
- dmd-2.087.1
114-
- dmd-2.086.1
115-
- dmd-2.085.1
116-
- dmd-2.084.1
117-
- dmd-2.083.1 ## As far back as unit-threaded seems to work
118-
- ldc-1.23.0 # eq to dmd v2.093.1
119-
- ldc-1.22.0 # eq to dmd v2.092.1
120-
- ldc-1.21.0 # eq to dmd v2.091.1
121-
- ldc-1.20.1 # eq to dmd v2.090.1
122-
- ldc-1.19.0 # eq to dmd v2.089.1
123-
124-
runs-on: ubuntu-20.04
125-
126-
services:
127-
mysql:
128-
image: mysql:5.7
129-
ports: [3306]
130-
env:
131-
MYSQL_ROOT_PASSWORD: f48dfhw3Hd!Asah7i2aZ
132-
MYSQL_DATABASE: testdb
133-
MYSQL_USER: testuser
134-
MYSQL_PASSWORD: passw0rd
135-
# Set health checks to wait until mysql service has started
136-
options: >-
137-
--health-cmd "mysqladmin ping"
138-
--health-interval 10s
139-
--health-timeout 3s
140-
--health-retries 4
141-
142-
steps:
143-
- uses: actions/checkout@v2
144-
145-
- name: Install ${{ matrix.compiler }}
146-
uses: dlang-community/setup-dlang@v1
147-
with:
148-
compiler: ${{ matrix.compiler }}
149-
150-
- name: Install dependencies on Ubuntu
151-
if: startsWith(matrix.os, 'ubuntu')
152-
run: sudo apt-get update && sudo apt-get install libevent-dev -y
153-
154-
## Turns out the unittest-vibe-ut tried to connect to an actualy MySQL on 172.18.0.1 so it's not
155-
## actually a unit test at all. It's an integration test and should be pulled out from the main
156-
## codebase into a separate sub module
157-
- name: Run unittest-vibe-ut
158-
env:
159-
MYSQL_PORT: ${{ job.services.mysql.ports[3306] }}
160-
run: |
161-
echo "host=localhost;port=$MYSQL_PORT;user=testuser;pwd=passw0rd;db=testdb" > testConnectionStr.txt
162-
dub run -c unittest-vibe-ut -- -t
163-
164-
- name: Build The Example Project
165-
working-directory: ./examples/homePage
166-
run: dub build
167-
168-
- name: Run Example (MySQL 5.7)
169-
working-directory: ./examples/homePage
170-
env:
171-
MYSQL_PORT: ${{ job.services.mysql.ports[3306] }}
172-
run: |
173-
./example "host=localhost;port=$MYSQL_PORT;user=testuser;pwd=passw0rd;db=testdb"

‎.github/workflows/integration-testing.yml

Lines changed: 64 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
name: CI
1+
name: Integration Tests
22

33
# MySQL Native should work with the following database versions:
4-
# mysql:8
4+
# mysql:8 (Broken on MySQL 8 - see: https://github.com/mysql-d/mysql-native/issues/230)
55
# mysql:5.7
66
# mariadb:10
77

@@ -12,82 +12,76 @@ on:
1212
pull_request:
1313

1414
jobs:
15-
mysql8-tests:
16-
name: MySQL 8 Tests ${{ matrix.compiler }}
17-
strategy:
18-
fail-fast: false
19-
matrix:
20-
compiler:
21-
- dmd-latest
22-
- ldc-latest
23-
- dmd-2.096.1
24-
- dmd-2.095.1
25-
- dmd-2.094.2
26-
- dmd-2.084.1
27-
- dmd-2.083.1 ## As far back as unit-threaded seems to work
28-
- ldc-1.23.0 # eq to dmd v2.093.1
29-
- ldc-1.19.0 # eq to dmd v2.089.1
30-
31-
runs-on: ubuntu-20.04
32-
33-
services:
34-
mysql:
35-
image: mysql:8
36-
ports: [3306]
37-
env:
38-
MYSQL_ROOT_PASSWORD: f48dfhw3Hd!Asah7i2aZ
39-
MYSQL_DATABASE: testdb
40-
MYSQL_USER: testuser
41-
MYSQL_PASSWORD: passw0rd
42-
# Set health checks to wait until mysql service has started
43-
options: >-
44-
--health-cmd "mysqladmin ping"
45-
--health-interval 10s
46-
--health-timeout 3s
47-
--health-retries 4
48-
49-
steps:
50-
- uses: actions/checkout@v2
51-
52-
- name: Install ${{ matrix.compiler }}
53-
uses: dlang-community/setup-dlang@v1
54-
with:
55-
compiler: ${{ matrix.compiler }}
56-
57-
- name: Install dependencies on Ubuntu
58-
if: startsWith(matrix.os, 'ubuntu')
59-
run: sudo apt-get update && sudo apt-get install libevent-dev -y
60-
61-
## Turns out the unittest-vibe-ut tried to connect to an actualy MySQL on 172.18.0.1 so it's not
62-
## actually a unit test at all. It's an integration test and should be pulled out from the main
63-
## codebase into a separate sub module
64-
- name: Run unittest-vibe-ut
65-
env:
66-
MYSQL_PORT: ${{ job.services.mysql.ports[3306] }}
67-
run: |
68-
echo "host=localhost;port=$MYSQL_PORT;user=testuser;pwd=passw0rd;db=testdb" > testConnectionStr.txt
69-
dub run -c unittest-vibe-ut -- -t
70-
71-
- name: Build The Example Project
72-
working-directory: ./examples/homePage
73-
run: dub build
74-
75-
- name: Run Example (MySQL 8)
76-
working-directory: ./examples/homePage
77-
env:
78-
MYSQL_PORT: ${{ job.services.mysql.ports[3306] }}
79-
run: |
80-
./example "host=localhost;port=$MYSQL_PORT;user=testuser;pwd=passw0rd;db=testdb"
15+
# mysql8-tests:
16+
# name: MySQL 8 Tests ${{ matrix.compiler }}
17+
# strategy:
18+
# fail-fast: false
19+
# max-parallel: 2
20+
# matrix:
21+
# compiler:
22+
# - dmd-latest
23+
# - ldc-latest
24+
25+
# runs-on: ubuntu-20.04
26+
27+
# services:
28+
# mysql:
29+
# image: mysql:8
30+
# ports: [3306]
31+
# env:
32+
# MYSQL_ROOT_PASSWORD: f48dfhw3Hd!Asah7i2aZ
33+
# MYSQL_DATABASE: testdb
34+
# MYSQL_USER: testuser
35+
# MYSQL_PASSWORD: passw0rd
36+
# # Set health checks to wait until mysql service has started
37+
# options: >-
38+
# --health-cmd "mysqladmin ping"
39+
# --health-interval 10s
40+
# --health-timeout 3s
41+
# --health-retries 4
42+
43+
# steps:
44+
# - uses: actions/checkout@v2
45+
46+
# - name: Install ${{ matrix.compiler }}
47+
# uses: dlang-community/setup-dlang@v1
48+
# with:
49+
# compiler: ${{ matrix.compiler }}
50+
51+
# - name: Install dependencies on Ubuntu
52+
# if: startsWith(matrix.os, 'ubuntu')
53+
# run: sudo apt-get update && sudo apt-get install libevent-dev -y
54+
55+
# ## Turns out the unittest-vibe-ut tried to connect to an actualy MySQL on 172.18.0.1 so it's not
56+
# ## actually a unit test at all. It's an integration test and should be pulled out from the main
57+
# ## codebase into a separate sub module
58+
# - name: Run unittest-vibe-ut
59+
# env:
60+
# MYSQL_PORT: ${{ job.services.mysql.ports[3306] }}
61+
# run: |
62+
# echo "host=localhost;port=$MYSQL_PORT;user=testuser;pwd=passw0rd;db=testdb" > testConnectionStr.txt
63+
# dub run -c unittest-vibe-ut -- -t
64+
65+
# - name: Build The Example Project
66+
# working-directory: ./examples/homePage
67+
# run: dub build
68+
69+
# - name: Run Example (MySQL 8)
70+
# working-directory: ./examples/homePage
71+
# env:
72+
# MYSQL_PORT: ${{ job.services.mysql.ports[3306] }}
73+
# run: |
74+
# ./example "host=localhost;port=$MYSQL_PORT;user=testuser;pwd=passw0rd;db=testdb"
8175

8276
mysql57-tests:
8377
name: MySQL 5.7 Tests ${{ matrix.compiler }}
8478
strategy:
8579
fail-fast: false
80+
max-parallel: 2
8681
matrix:
8782
compiler:
8883
- dmd-latest
8984
- ldc-latest
90-
- dmd-2.096.1
9185
- dmd-2.095.1
9286
- dmd-2.094.2
9387
- dmd-2.084.1
@@ -150,11 +144,11 @@ jobs:
150144
name: MariaDB 10 Tests ${{ matrix.compiler }}
151145
strategy:
152146
fail-fast: false
147+
max-parallel: 2
153148
matrix:
154149
compiler:
155150
- dmd-latest
156151
- ldc-latest
157-
- dmd-2.096.1
158152
- dmd-2.095.1
159153
- dmd-2.094.2
160154
- dmd-2.084.1

‎README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ MySQL native
22
============
33

44
[![DUB Package](https://img.shields.io/dub/v/mysql-native.svg)](https://code.dlang.org/packages/mysql-native)
5-
[![GitHub CI](https://github.com/mysql-d/mysql-native/actions/workflows/dub.yml/badge.svg)](https://github.com/mysql-d/mysql-native/actions/workflows/dub.yml)
5+
[![GitHub - Builds](https://github.com/mysql-d/mysql-native/actions/workflows/dub.yml/badge.svg)](https://github.com/mysql-d/mysql-native/actions/workflows/dub.yml)
6+
[![GitHub - Integration Tests](https://github.com/mysql-d/mysql-native/actions/workflows/integration-testing.yml/badge.svg)](https://github.com/mysql-d/mysql-native/actions/workflows/integration-testing.yml)
67

78
A [Boost-licensed](http://www.boost.org/LICENSE_1_0.txt) native [D](http://dlang.org)
89
client driver for MySQL and MariaDB.

0 commit comments

Comments
 (0)