Skip to content

Commit

Permalink
Release 0.1.3 (#149)
Browse files Browse the repository at this point in the history
* Build release branches and PRs to release branches

* Update crypto_box requirement from 0.7.1 to 0.8.1 (#107)

* Update crypto_box requirement from 0.7.1 to 0.8.1

Updates the requirements on [crypto_box](https://github.com/RustCrypto/nacl-compat) to permit the latest version.
- [Release notes](https://github.com/RustCrypto/nacl-compat/releases)
- [Commits](RustCrypto/nacl-compat@crypto_box-v0.7.1...crypto_box-v0.8.1)

---
updated-dependencies:
- dependency-name: crypto_box
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

* update with crypto_box new API

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Alex Xiong <[email protected]>

* Fix clippy errors

* Release 0.1.3

Update crypto box to prevent dependency resolution conflicts.

See: #107

- Add a release branch, since this diverges from main.
- Build pushes and PRs to release branch.

* bump zeroize and use nix flake

* fix clippy error

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Alex Xiong <[email protected]>
  • Loading branch information
3 people authored Nov 30, 2022
1 parent 190213a commit 06e5b4b
Show file tree
Hide file tree
Showing 40 changed files with 453 additions and 475 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ on:
push:
branches:
- main
- release-*
pull_request:
branches:
- main
- release-*
schedule:
- cron: '0 0 * * 1'
workflow_dispatch:
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

## Pending

## v0.1.3

- Update dependencies
- `crypto_box` from `0.7.1` to `0.8.1`
- `zeroize` from `1.3` to `^1.5`
- Use nix flake instead, bump rust version to the latest

## v0.1.2

### Improvements
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[workspace]
members = [
"plonk",
"rescue",
"primitives",
"rescue",
"utilities",
"utilities_derive",
]
204 changes: 204 additions & 0 deletions flake.lock

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

89 changes: 89 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
# Copyright (c) 2022 Espresso Systems (espressosys.com)
# This file is part of the Jellyfish library.

# You should have received a copy of the MIT License
# along with the Jellyfish library. If not, see <https://mit-license.org/>.

{
description = "Jellyfish dev env";

inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
inputs.flake-utils.url = "github:numtide/flake-utils"; # for dedup

# allow shell.nix alongside flake.nix
inputs.flake-compat.url = "github:edolstra/flake-compat";
inputs.flake-compat.flake = false;

inputs.rust-overlay.url = "github:oxalica/rust-overlay";
inputs.pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
inputs.pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs";

outputs = { self, nixpkgs, flake-utils, flake-compat, rust-overlay, pre-commit-hooks, ... }:
flake-utils.lib.eachDefaultSystem (system:
let
overlays = [ (import rust-overlay) ];
pkgs = import nixpkgs { inherit system overlays; };
nightlyToolchain = pkgs.rust-bin.selectLatestNightlyWith
(toolchain: toolchain.minimal.override { extensions = [ "rustfmt" ]; });

stableToolchain = pkgs.rust-bin.stable.latest.minimal.override {
extensions = [ "clippy" "llvm-tools-preview" "rust-src" ];
};
in with pkgs;
{
check = {
pre-commit-check = pre-commit-hooks.lib.${system}.run {
src = ./.;
hooks = {
check-format = {
enable = true;
files = "\\.rs$";
entry = "cargo fmt -- --check";
};
doctest = {
enable = true;
entry = "cargo test --doc";
files = "\\.rs$";
pass_filenames = false;
};
cargo-clippy = {
enable = true;
description = "Lint Rust code.";
entry = "cargo-clippy --workspace -- -D warnings";
files = "\\.rs$";
pass_filenames = false;
};
cargo-sort = {
enable = true;
description = "Ensure Cargo.toml are sorted";
entry = "cargo sort -w";
pass_filenames = false;
};
};
};
};
devShell = mkShell {
buildInputs = [
argbash
openssl
pkgconfig
git

stableToolchain
nightlyToolchain
cargo-sort

] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];

shellHook = ''
export RUST_BACKTRACE=full
export PATH="$PATH:$(pwd)/target/debug:$(pwd)/target/release"
# Ensure `cargo fmt` uses `rustfmt` from nightly.
export RUSTFMT="${nightlyToolchain}/bin/rustfmt"
''
# install pre-commit hooks
+ self.check.${system}.pre-commit-check.shellHook;
};
}
);
}
28 changes: 0 additions & 28 deletions nix/grcov/default.nix

This file was deleted.

25 changes: 0 additions & 25 deletions nix/nightly.nix

This file was deleted.

4 changes: 0 additions & 4 deletions nix/nixpkgs.json

This file was deleted.

Loading

0 comments on commit 06e5b4b

Please sign in to comment.