Skip to content

Commit

Permalink
Auto merge of #5262 - str4d:bump-deps-4.5.0, r=str4d
Browse files Browse the repository at this point in the history
Update dependencies

We now build with Rust 1.54 and Clang / libc++ 12.
  • Loading branch information
zkbot committed Jul 31, 2021
2 parents 82a50f6 + bdaf3e1 commit b67ffbb
Show file tree
Hide file tree
Showing 12 changed files with 112 additions and 140 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/lints.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,19 +54,19 @@ jobs:
if: always()

rust-clippy:
name: Clippy (1.51.0)
name: Clippy (1.54.0)
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.51.0
toolchain: 1.54.0
components: clippy
override: true
- name: Run clippy
uses: actions-rs/clippy-check@v1
with:
name: Clippy (1.51.0)
name: Clippy (1.54.0)
token: ${{ secrets.GITHUB_TOKEN }}
args: --all-features --all-targets -- -D warnings

Expand All @@ -77,7 +77,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.51.0
toolchain: 1.54.0
override: true
- run: rustup component add rustfmt
- uses: actions-rs/cargo@v1
Expand Down
128 changes: 46 additions & 82 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ ed25519-zebra = "2.2.0"
# Metrics
hyper = { version = "=0.14.2", default-features = false, features = ["server", "tcp", "http1"] }
ipnet = "2"
metrics = "0.16"
metrics-exporter-prometheus = "0.5"
metrics = "0.17"
metrics-exporter-prometheus = "0.6"
thiserror = "1"
tokio = { version = "1.0", features = ["rt", "net", "time", "macros"] }

Expand Down
3 changes: 2 additions & 1 deletion depends/packages/bdb.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ $(package)_download_path=https://download.oracle.com/berkeley-db
$(package)_file_name=db-$($(package)_version).tar.gz
$(package)_sha256_hash=47612c8991aa9ac2f6be721267c8d3cdccf5ac83105df8e50809daea24e95dc7
$(package)_build_subdir=build_unix
$(package)_patches=winioctl-and-atomic_init_db.patch
$(package)_patches=clang-12-stpcpy-issue.diff winioctl-and-atomic_init_db.patch

ifneq ($(host_os),darwin)
$(package)_dependencies=libcxx
Expand All @@ -30,6 +30,7 @@ endif
endef

define $(package)_preprocess_cmds
patch -p1 <$($(package)_patch_dir)/clang-12-stpcpy-issue.diff && \
patch -p1 <$($(package)_patch_dir)/winioctl-and-atomic_init_db.patch
endef

Expand Down

0 comments on commit b67ffbb

Please sign in to comment.