Skip to content

Commit d940ba2

Browse files
authored
Merge pull request #47 from weiznich/fix/issue-45
Fix #45
2 parents b0cf967 + 8c1dc2f commit d940ba2

File tree

5 files changed

+8
-9
lines changed

5 files changed

+8
-9
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
name: Check
88
strategy:
99
matrix:
10-
rust: ["1.38.0", "stable", "beta", "nightly"]
10+
rust: ["1.42.0", "stable", "beta", "nightly"]
1111
backend: ["postgres", "sqlite"]
1212
os: [ubuntu-18.04, macos-latest, windows-latest]
1313
runs-on: ${{ matrix.os }}
@@ -58,12 +58,11 @@ jobs:
5858
brew update
5959
brew uninstall --ignore-dependencies libpq
6060
brew install postgres
61-
/usr/local/Cellar/postgresql/12.2/bin/initdb --locale=C -E UTF-8 /usr/local/var/postgres
62-
/usr/local/opt/postgres/bin/pg_ctl -D /usr/local/var/postgres start
61+
pg_ctl -D /usr/local/var/postgres start
6362
sleep 3
64-
/usr/local/opt/postgres/bin/createuser -s postgres
65-
/usr/local/opt/postgres/bin/createdb wundergraph_test -O postgres
66-
/usr/local/opt/postgres/bin/psql -c "ALTER USER postgres PASSWORD 'postgres';" wundergraph_test
63+
createuser -s postgres
64+
createdb wundergraph_test -O postgres
65+
psql -c "ALTER USER postgres PASSWORD 'postgres';" wundergraph_test
6766
6867
- name: Install sqlite (MacOS)
6968
if: runner.os == 'macOS' && matrix.backend == 'sqlite'
@@ -150,7 +149,7 @@ jobs:
150149
- uses: actions/checkout@v1
151150
- uses: actions-rs/toolchain@v1
152151
with:
153-
toolchain: nightly-2019-10-03
152+
toolchain: 1.42.0
154153
profile: minimal
155154
components: clippy, rustfmt
156155
- name: Cache cargo registry

rust-toolchain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nightly-2019-10-03
1+
1.42.0

wundergraph_cli/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ reqwest = "0.9"
2323
serde_json = "1"
2424

2525
[features]
26-
default = ["postgres"]
26+
default = ["postgres", "sqlite"]
2727
sqlite = ["diesel/sqlite"]
2828
postgres = ["diesel/postgres"]

0 commit comments

Comments
 (0)