Skip to content

Commit

Permalink
Support Crystal 0.34.0 (#389)
Browse files Browse the repository at this point in the history
* update shards

* fix linting errors

* rollback ameba

* rollback ameba

* update to crystal 0.34.0

* set postgres password
  • Loading branch information
drujensen authored Apr 12, 2020
1 parent ea3a3c7 commit 1e03833
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 10 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ matrix:
env:
- CURRENT_ADAPTER=mysql
- MYSQL_VERSION=5.7
- PG_VERSION=10.4
- PG_VERSION=10.5
- name: "Mysql 5.6"
env:
- CURRENT_ADAPTER=mysql
- MYSQL_VERSION=5.6
- PG_VERSION=10.4
- PG_VERSION=10.5
- name: "Postgres 9.6"
env:
- CURRENT_ADAPTER=pg
Expand All @@ -40,13 +40,13 @@ matrix:
env:
- CURRENT_ADAPTER=sqlite
- MYSQL_VERSION=5.7
- PG_VERSION=10.4
- PG_VERSION=10.5
- SQLITE_VERSION=3110000
- SQLITE_VERSION_YEAR=2016
- name: "Sqlite 3.25.2"
env:
- CURRENT_ADAPTER=sqlite
- MYSQL_VERSION=5.7
- PG_VERSION=10.4
- PG_VERSION=10.5
- SQLITE_VERSION=3250200
- SQLITE_VERSION_YEAR=2018
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM crystallang/crystal:0.32.1
FROM crystallang/crystal:0.34.0

ARG sqlite_version=3110000
ARG sqlite_version_year=2016
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ services:
command: 'bash -c "cd /app/user && bin/ameba && crystal tool format --check && crystal spec --warnings all"'
working_dir: /app/user
environment:
PG_DATABASE_URL: 'postgres://postgres:@pg:5432/postgres'
PG_DATABASE_URL: 'postgres://postgres:pass@pg:5432/postgres'
MYSQL_DATABASE_URL: 'mysql://user:pass@mysql:3306/test'
SQLITE_DATABASE_URL: 'sqlite3:./test.db'
CURRENT_ADAPTER: sqlite
2 changes: 2 additions & 0 deletions docker/docker-compose.pg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ services:
- pg
pg:
image: postgres:${PG_VERSION}
environment:
POSTGRES_PASSWORD: pass
8 changes: 4 additions & 4 deletions shard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,20 @@ license: MIT
dependencies:
db:
github: crystal-lang/crystal-db
version: ~> 0.8.0
version: ~> 0.9.0

development_dependencies:
mysql:
github: crystal-lang/crystal-mysql
version: ~> 0.10.0
version: ~> 0.11.0

sqlite3:
github: crystal-lang/crystal-sqlite3
version: ~> 0.15.0
version: ~> 0.16.0

pg:
github: will/crystal-pg
version: ~> 0.20.0
version: ~> 0.21.0

ameba:
github: crystal-ameba/ameba
Expand Down

0 comments on commit 1e03833

Please sign in to comment.