From fff4633f114f94fb6d1e0ea87f05e85a3cf58285 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 14 Aug 2020 15:24:16 +0000 Subject: [PATCH 1/5] Update ipnetwork requirement from 0.16.0 to 0.17.0 Updates the requirements on [ipnetwork](https://github.com/achanda/ipnetwork) to permit the latest version. - [Release notes](https://github.com/achanda/ipnetwork/releases) - [Commits](https://github.com/achanda/ipnetwork/compare/v0.16.0...v0.17.0) Signed-off-by: dependabot-preview[bot] --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index ab51a41..d2613ab 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ 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"] } [dependencies.chrono] From 5ad19e0b235605899bc41d210391cc1df087da2b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 14 Aug 2020 15:27:34 +0000 Subject: [PATCH 2/5] Create Dependabot config file --- .github/dependabot.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..c33c8bd --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,8 @@ +version: 2 +updates: +- package-ecosystem: cargo + directory: "/" + schedule: + interval: daily + time: "21:00" + open-pull-requests-limit: 10 From aafb52c54f04b8370b4bd39ae9cfa6a5cfffb383 Mon Sep 17 00:00:00 2001 From: Ramsay Date: Sat, 15 Aug 2020 09:46:39 +0800 Subject: [PATCH 3/5] update github action config, update rocket to 0.4.4 --- .github/workflows/rust.yml | 38 +++++++++++++++++++++++++------------- Cargo.toml | 12 +++--------- 2 files changed, 28 insertions(+), 22 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 3c13d1b..a27ea8f 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -1,22 +1,34 @@ name: Rust -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] +on: [push, pull_request] env: CARGO_TERM_COLOR: always -jobs: - build: +name: Continuous Integration +jobs: + 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 diff --git a/Cargo.toml b/Cargo.toml index ab51a41..5e45db9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,8 +10,7 @@ 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" @@ -21,16 +20,11 @@ rand = "0.7" # 确保和diesel的ipnetwork 版本一致, 用cargo tree 命令查看 ipnetwork = "0.16.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" \ No newline at end of file From 026495b570359b338c52c7c71b16cb8e0c710f52 Mon Sep 17 00:00:00 2001 From: Ramsay Leung Date: Sat, 15 Aug 2020 09:53:27 +0800 Subject: [PATCH 4/5] Update rust.yml fix syntax error --- .github/workflows/rust.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index a27ea8f..7f8c28d 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -1,12 +1,10 @@ -name: Rust +name: Continuous Integration on: [push, pull_request] env: CARGO_TERM_COLOR: always -name: Continuous Integration - jobs: check: name: Check From 0e02ae6d27a85852f4fc2e3bd00179f6b54a0ebe Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 14 Aug 2020 15:24:16 +0000 Subject: [PATCH 5/5] Update ipnetwork requirement from 0.16.0 to 0.17.0 Updates the requirements on [ipnetwork](https://github.com/achanda/ipnetwork) to permit the latest version. - [Release notes](https://github.com/achanda/ipnetwork/releases) - [Commits](https://github.com/achanda/ipnetwork/compare/v0.16.0...v0.17.0) Signed-off-by: dependabot-preview[bot] --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 5e45db9..302a30c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,7 +18,7 @@ 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]