Skip to content

Commit

Permalink
Merge pull request #138 from go-reform/v1-3
Browse files Browse the repository at this point in the history
Version 1.3.1
  • Loading branch information
AlekSi authored Dec 7, 2017
2 parents a76bd30 + 8ffad73 commit 161dee9
Show file tree
Hide file tree
Showing 21 changed files with 404 additions and 857 deletions.
5 changes: 4 additions & 1 deletion .codecov.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
codecov:
branch: v1-stable
branch: "v1-stable"

coverage:
range: "50...80"
114 changes: 0 additions & 114 deletions .drone-local.yml

This file was deleted.

451 changes: 0 additions & 451 deletions .drone.yml

This file was deleted.

1 change: 0 additions & 1 deletion .drone.yml.sig

This file was deleted.

1 change: 0 additions & 1 deletion .gitattributes

This file was deleted.

27 changes: 10 additions & 17 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,20 @@ you want to implement _before_ implementing it.

## Running tests

To run tests locally you have two options: installing database systems locally, or use Docker and Drone CLI.
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.


### Local install
### Docker Compose

You should install _some_ versions of PostgreSQL and MySQL.
For Mac with Homebrew this should work:
```
brew update
brew install postgresql
brew services start postgresql
brew install mysql
brew services start mysql
```
If you have Go, Docker and Docker Compose installed, you can run all tests and linters simply by running `make`.

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

### Direct

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

If you have Docker, you can use [Drone CI](http://readme.drone.io/0.5/) CLI to run tests without installing database
systems. First, you should install [Drone 0.5 CLI](http://readme.drone.io/0.5/install/cli/). Then, run tests with
`make drone`.

### Background information

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.
10 changes: 10 additions & 0 deletions .github/docker-compose-mssql.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
version: '3'
services:
mssql:
image: microsoft/mssql-server-linux:${REFORM_IMAGE_VERSION}
environment:
- ACCEPT_EULA=Y
- SA_PASSWORD=reform-password123
ports:
- 127.0.0.1:1433:1433
11 changes: 11 additions & 0 deletions .github/docker-compose-mysql-traditional.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
version: '3'
services:
mysql-traditional:
image: mysql/mysql-server:${REFORM_IMAGE_VERSION}
environment:
- TZ=Europe/Moscow
- MYSQL_ALLOW_EMPTY_PASSWORD=1
- MYSQL_ROOT_HOST=%
ports:
- 127.0.0.1:3306:3306
11 changes: 11 additions & 0 deletions .github/docker-compose-mysql.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
version: '3'
services:
mysql:
image: mysql/mysql-server:${REFORM_IMAGE_VERSION}
environment:
- TZ=Europe/Moscow
- MYSQL_ALLOW_EMPTY_PASSWORD=1
- MYSQL_ROOT_HOST=%
ports:
- 127.0.0.1:3306:3306
9 changes: 9 additions & 0 deletions .github/docker-compose-postgres.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
version: '3'
services:
postgres:
image: postgres:${REFORM_IMAGE_VERSION}
environment:
- TZ=Europe/Moscow
ports:
- 127.0.0.1:5432:5432
2 changes: 2 additions & 0 deletions .github/docker-compose-sqlite3.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
version: '3'
10 changes: 10 additions & 0 deletions .github/docker-compose-sqlserver.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
version: '3'
services:
sqlserver:
image: microsoft/mssql-server-linux:${REFORM_IMAGE_VERSION}
environment:
- ACCEPT_EULA=Y
- SA_PASSWORD=reform-password123
ports:
- 127.0.0.1:1433:1433
175 changes: 0 additions & 175 deletions .github/drone-gen.go

This file was deleted.

Loading

0 comments on commit 161dee9

Please sign in to comment.