Skip to content

Commit e28cdd9

Browse files
authored
Update CI (#102)
* Update CI
1 parent 355d4db commit e28cdd9

File tree

1 file changed

+32
-3
lines changed

1 file changed

+32
-3
lines changed

.circleci/config.yml

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
- run: brew update
99
- run: brew install https://gist.github.com/novi/dd21d48d260379e8919d9490bf5cfaec/raw/6ea4daa02d93f4ab0110ad30d87ea2b497a71cd0/cmysqlmariadb.rb #cmysql
1010
- run: mkdir -p /usr/local/etc/my.cnf.d #workaround
11-
- run: mysql.server start
11+
- run: sh -c "mysqld_safe --skip-grant-tables & sleep 5"
1212
- run: mysql -u root -e "create database IF NOT EXISTS test;"
1313
- run: swift build
1414
- run: swift test
@@ -20,7 +20,19 @@ jobs:
2020
- run: brew update
2121
- run: brew install https://gist.github.com/novi/dd21d48d260379e8919d9490bf5cfaec/raw/6ea4daa02d93f4ab0110ad30d87ea2b497a71cd0/cmysqlmariadb.rb #cmysql
2222
- run: mkdir -p /usr/local/etc/my.cnf.d #workaround
23-
- run: mysql.server start
23+
- run: sh -c "mysqld_safe --skip-grant-tables & sleep 5"
24+
- run: mysql -u root -e "create database IF NOT EXISTS test;"
25+
- run: swift build
26+
- run: swift test
27+
mac-swift5.1:
28+
macos:
29+
xcode: "11.0.0"
30+
steps:
31+
- checkout
32+
- run: brew update
33+
- run: brew install https://gist.github.com/novi/dd21d48d260379e8919d9490bf5cfaec/raw/6ea4daa02d93f4ab0110ad30d87ea2b497a71cd0/cmysqlmariadb.rb #cmysql
34+
- run: mkdir -p /usr/local/etc/my.cnf.d #workaround
35+
- run: sh -c "mysqld_safe --skip-grant-tables & sleep 5"
2436
- run: mysql -u root -e "create database IF NOT EXISTS test;"
2537
- run: swift build
2638
- run: swift test
@@ -80,6 +92,21 @@ jobs:
8092
- run: sleep 5 #wait for mysql
8193
- run: swift build
8294
- run: swift test
95+
linux-swift5.1:
96+
docker:
97+
- image: yusukeito/swift-basic:swift5.1
98+
- image: mariadb:10.3
99+
environment:
100+
MYSQL_USER: root
101+
MYSQL_DATABASE: "test"
102+
MYSQL_ALLOW_EMPTY_PASSWORD: yes
103+
MYSQL_ROOT_HOST: "%"
104+
DATABASE_HOST: "%"
105+
steps:
106+
- checkout
107+
- run: sleep 5 #wait for mysql
108+
- run: swift build
109+
- run: swift test
83110

84111
workflows:
85112
version: 2
@@ -88,6 +115,8 @@ workflows:
88115
- mac-swift4.2
89116
- mac-swift5.0
90117
- mac-swift5.0-mysql
118+
- mac-swift5.1
91119
- linux-swift4.1
92120
- linux-swift4.2
93-
- linux-swift5.0
121+
- linux-swift5.0
122+
- linux-swift5.1

0 commit comments

Comments
 (0)