Merge branch 'master' into rework-core-traits

This commit is contained in:
tyranron 2022-05-27 16:36:16 +02:00
commit 224b04973a
No known key found for this signature in database
GPG key ID: 762E144FB230A4F0
3 changed files with 24 additions and 3 deletions

View file

@ -16,6 +16,28 @@ env:
jobs:
################
# Pull Request #
################
pr:
if: ${{ github.event_name == 'pull_request'
&& !contains(github.event.head_commit.message, '[skip ci]') }}
needs:
- clippy
- example
- feature
- release-check
- rustfmt
- test
- wasm
runs-on: ubuntu-latest
steps:
- run: true
##########################
# Linting and formatting #
##########################

View file

@ -11,7 +11,6 @@ All user visible changes to `juniper_rocket` crate will be documented in this fi
### BC Breaks
- Switched to 0.16 version of [`juniper` crate].
- Switched to 0.5.0-rc.2 version of [`rocket` crate].
### Added
@ -25,7 +24,7 @@ All user visible changes to `juniper_rocket` crate will be documented in this fi
## Previous releases
See [old CHANGELOG](/../../blob/juniper_rocket-v0.8.1/juniper_rocket/CHANGELOG.md).
See [old CHANGELOG](/../../blob/juniper_rocket-v0.8.2/juniper_rocket/CHANGELOG.md).

View file

@ -19,7 +19,7 @@ exclude = ["/examples/", "/tests/", "/release.toml"]
[dependencies]
futures = "0.3.1"
juniper = { version = "0.16.0-dev", path = "../juniper", default-features = false }
rocket = { version = "0.5.0-rc.2", default-features = false }
rocket = { version = "=0.5.0-rc.2", default-features = false }
serde_json = "1.0.2"
[dev-dependencies]