Skip to content

Commit

Permalink
depends: cxx 1.0.113
Browse files Browse the repository at this point in the history
  • Loading branch information
str4d committed Jan 2, 2024
1 parent acb070d commit d031ce5
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 32 deletions.
12 changes: 6 additions & 6 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ wagyu-zcash-parameters = "0.2"

# Rust/C++ interop
# The version needs to match depends/packages/native_cxxbridge.mk
cxx = { version = "=1.0.111", features = ["c++17"] }
cxx = { version = "=1.0.113", features = ["c++17"] }

# Rust threading
rayon = "1.5"
Expand Down
6 changes: 3 additions & 3 deletions depends/packages/native_cxxbridge.mk
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package=native_cxxbridge
# The version needs to match cxx in Cargo.toml
$(package)_version=1.0.111
$(package)_version=1.0.113
$(package)_download_path=https://github.com/dtolnay/cxx/archive/refs/tags
$(package)_file_name=native_cxxbridge-$($(package)_version).tar.gz
$(package)_download_file=$($(package)_version).tar.gz
$(package)_sha256_hash=89b80c4b50410b28e4a78db99cd2764cd017bfbffed0c7ca91f8e01ba9539cd4
$(package)_sha256_hash=0760e02a1faf3357b28f0ee759ffaae05299092d8d3081a23ec2557e55aaf947
$(package)_build_subdir=gen/cmd
$(package)_dependencies=native_rust
# This file is somewhat annoying to update, but can be done like so from the repo base:
# $ export VERSION=1.0.111
# $ export VERSION=1.0.113
# $ rm .cargo/config .cargo/.configured-for-offline
# $ mkdir tmp
# $ cd tmp
Expand Down
44 changes: 22 additions & 22 deletions depends/patches/native_cxxbridge/Cargo.lock

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

15 changes: 15 additions & 0 deletions qa/supply-chain/audits.toml
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,11 @@ criteria = "safe-to-deploy"
delta = "1.0.107 -> 1.0.111"
notes = "Build script change is to look for `src/cxx.cc` in the same folder as `include/cxx.h`."

[[audits.cxx]]
who = "Jack Grigg <jack@electriccoin.co>"
criteria = "safe-to-deploy"
delta = "1.0.111 -> 1.0.113"

[[audits.cxxbridge-flags]]
who = "Daira Hopwood <daira@jacaranda.org>"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -587,6 +592,11 @@ who = "Jack Grigg <jack@electriccoin.co>"
criteria = "safe-to-deploy"
delta = "1.0.107 -> 1.0.111"

[[audits.cxxbridge-flags]]
who = "Jack Grigg <jack@electriccoin.co>"
criteria = "safe-to-deploy"
delta = "1.0.111 -> 1.0.113"

[[audits.cxxbridge-macro]]
who = "Daira Hopwood <daira@jacaranda.org>"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -660,6 +670,11 @@ generated code clearer (instead of using the `unsafe fn`'s implicit `unsafe`
block).
"""

[[audits.cxxbridge-macro]]
who = "Jack Grigg <jack@electriccoin.co>"
criteria = "safe-to-deploy"
delta = "1.0.111 -> 1.0.113"

[[audits.deranged]]
who = "Jack Grigg <jack@electriccoin.co>"
criteria = "safe-to-deploy"
Expand Down

0 comments on commit d031ce5

Please sign in to comment.