Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update ipnetwork requirement from 0.16.0 to 0.17.0 #15

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
8 changes: 8 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
version: 2
updates:
- package-ecosystem: cargo
directory: "/"
schedule:
interval: daily
time: "21:00"
open-pull-requests-limit: 10
38 changes: 24 additions & 14 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,32 @@
name: Rust
name: Continuous Integration

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]
on: [push, pull_request]

env:
CARGO_TERM_COLOR: always

jobs:
build:

check:
name: Check
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Build
run: cargo build --verbose
- name: Run tests
run: cargo test --verbose
- name: Checkout sources
uses: actions/checkout@v2

- name: Install stable toolchain
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: nightly
override: true

- name: Run cargo check
uses: actions-rs/cargo@v1
with:
command: check
args: --all-targets

- name: Run cargo build
uses: actions-rs/cargo@v1
with:
command: build
14 changes: 4 additions & 10 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,27 +10,21 @@ error-chain = "0.12.1"
lazy_static = "1.1.0"
r2d2 = "0.8.7"
r2d2-diesel = "1.0.0"
rocket = "0.4.4"
rocket_codegen = "0.4.4"
rocket = "0.4.5"
serde = { version = "1.0.70", features = ["derive"] }
serde_derive = "1.0.70"
serde_json = "1.0.24"
tera = "0.11.20"
bcrypt = "0.6"
rand = "0.7"
# 确保和diesel的ipnetwork 版本一致, 用cargo tree 命令查看
ipnetwork = "0.16.0"
ipnetwork = "0.17.0"
fern = { version = "0.5.8", features = ["colored"] }

rocket_contrib={version="0.4.5", features = ["handlebars_templates", "tera_templates", "json"]}
[dependencies.chrono]
features = ["serde", "rustc-serialize"]
version = "0.4.7"

[dependencies.diesel]
features = ["postgres", "chrono","network-address","serde_json"]
version = "1.3.2"

[dependencies.rocket_contrib]
default-features = false
features = ["handlebars_templates", "tera_templates", "json"]
version = "0.4.2"
version = "1.3.2"