Skip to content

Commit

Permalink
Merge pull request #4 from macisamuele/maci-allow-test-on-stable
Browse files Browse the repository at this point in the history
Add Cargo categories and patch test-case-derive to allow testing on stable
  • Loading branch information
macisamuele authored Jul 25, 2019
2 parents 617981a + 0265b78 commit 5dfe1bf
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
5 changes: 1 addition & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
language: rust
rust: stable

env:
global:
Expand All @@ -11,7 +12,6 @@ matrix:
# TODO: add osx and windows testing environments
- os: linux
dist: xenial
rust: nightly
env: MAKE_TARGET=coverage
addons:
apt:
Expand All @@ -25,15 +25,12 @@ matrix:
- os: linux
dist: xenial
env: MAKE_TARGET=test
rust: nightly # TODO: set it to stable once https://github.com/synek317/test-case-derive/pull/5 is released
- os: linux
dist: xenial
env: MAKE_TARGET=doc
rust: stable
- os: linux
dist: xenial
env: MAKE_TARGET=lint
rust: nightly # TODO: set it to stable once https://github.com/synek317/test-case-derive/pull/5 is released
allow_failures:
- env: MAKE_TARGET=lint

Expand Down
5 changes: 5 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[package]
authors = ["Samuele Maci <macisamuele@gmail.com>"]
categories = ["data-structures", "development-tools", "encoding", "parsing"]
description = "Rust interface (aka trait) to deal with objects as they are JSON objects"
repository = "https://github.com/macisamuele/json-trait-rs"
edition = "2018"
Expand Down Expand Up @@ -37,3 +38,7 @@ serde_yaml = { version = "0", optional = true }
strum = "0"
strum_macros = "0"
unreachable = "1"

[patch.crates-io]
# TODO: Remove patch once https://github.com/synek317/test-case-derive/pull/5 is merged
test-case-derive = { git = "https://github.com/macisamuele/test-case-derive", branch = "maci-allow-build-on-stable"}

0 comments on commit 5dfe1bf

Please sign in to comment.