Skip to content

Commit 161dee9

Browse files
authored
Merge pull request #138 from go-reform/v1-3
Version 1.3.1
2 parents a76bd30 + 8ffad73 commit 161dee9

21 files changed

+404
-857
lines changed

.codecov.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
codecov:
2-
branch: v1-stable
2+
branch: "v1-stable"
3+
4+
coverage:
5+
range: "50...80"

.drone-local.yml

Lines changed: 0 additions & 114 deletions
This file was deleted.

.drone.yml

Lines changed: 0 additions & 451 deletions
This file was deleted.

.drone.yml.sig

Lines changed: 0 additions & 1 deletion
This file was deleted.

.gitattributes

Lines changed: 0 additions & 1 deletion
This file was deleted.

.github/CONTRIBUTING.md

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,20 @@ you want to implement _before_ implementing it.
99

1010
## Running tests
1111

12-
To run tests locally you have two options: installing database systems locally, or use Docker and Drone CLI.
12+
First of all, run `make deps` to install all dependencies. After that, you have two options: use Docker Compose (recommended), or installing database systems directly.
1313

1414

15-
### Local install
15+
### Docker Compose
1616

17-
You should install _some_ versions of PostgreSQL and MySQL.
18-
For Mac with Homebrew this should work:
19-
```
20-
brew update
21-
brew install postgresql
22-
brew services start postgresql
23-
brew install mysql
24-
brew services start mysql
25-
```
17+
If you have Go, Docker and Docker Compose installed, you can run all tests and linters simply by running `make`.
2618

27-
Download dependencies with `make download_deps` and install them with `make install_deps`.
28-
Then run tests with `make`. See [`Makefile`](../Makefile) for connection parameters.
2919

20+
### Direct
3021

31-
### Drone
22+
Run `make test` to run basic unit tests. Run `make check` to run linters.
23+
See [`Makefile`](../Makefile) for Make targets for running integration tests and connection parameters.
3224

33-
If you have Docker, you can use [Drone CI](http://readme.drone.io/0.5/) CLI to run tests without installing database
34-
systems. First, you should install [Drone 0.5 CLI](http://readme.drone.io/0.5/install/cli/). Then, run tests with
35-
`make drone`.
25+
26+
### Background information
27+
28+
See [#5](https://github.com/go-reform/reform/issues/5), [#63](https://github.com/go-reform/reform/issues/63), and [#135](https://github.com/go-reform/reform/issues/135) for reasons for that design.

.github/docker-compose-mssql.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
version: '3'
3+
services:
4+
mssql:
5+
image: microsoft/mssql-server-linux:${REFORM_IMAGE_VERSION}
6+
environment:
7+
- ACCEPT_EULA=Y
8+
- SA_PASSWORD=reform-password123
9+
ports:
10+
- 127.0.0.1:1433:1433
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
version: '3'
3+
services:
4+
mysql-traditional:
5+
image: mysql/mysql-server:${REFORM_IMAGE_VERSION}
6+
environment:
7+
- TZ=Europe/Moscow
8+
- MYSQL_ALLOW_EMPTY_PASSWORD=1
9+
- MYSQL_ROOT_HOST=%
10+
ports:
11+
- 127.0.0.1:3306:3306

.github/docker-compose-mysql.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
version: '3'
3+
services:
4+
mysql:
5+
image: mysql/mysql-server:${REFORM_IMAGE_VERSION}
6+
environment:
7+
- TZ=Europe/Moscow
8+
- MYSQL_ALLOW_EMPTY_PASSWORD=1
9+
- MYSQL_ROOT_HOST=%
10+
ports:
11+
- 127.0.0.1:3306:3306
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
version: '3'
3+
services:
4+
postgres:
5+
image: postgres:${REFORM_IMAGE_VERSION}
6+
environment:
7+
- TZ=Europe/Moscow
8+
ports:
9+
- 127.0.0.1:5432:5432

0 commit comments

Comments
 (0)