Skip to content

Commit

Permalink
Merge pull request #3904 from iron-fish/staging
Browse files Browse the repository at this point in the history
STAGING -> MASTER
  • Loading branch information
dguenther authored May 9, 2023
2 parents 6dc93a4 + 040c441 commit 44a3e58
Show file tree
Hide file tree
Showing 130 changed files with 6,883 additions and 813 deletions.
5 changes: 4 additions & 1 deletion .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
[alias]
benchmark = "bench --package benchmarks"

[target.aarch64-unknown-linux-gnu]
linker = "aarch64-linux-gnu-gcc"

[target.aarch64-unknown-linux-musl]
linker = "aarch64-linux-musl-gcc"
rustflags = ["-C", "target-feature=-crt-static"]
rustflags = ["-C", "target-feature=-crt-static"]
5 changes: 0 additions & 5 deletions .github/ISSUE_TEMPLATE/BUG-REPORT.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,3 @@ body:
label: Relevant log output
description: Please copy and paste any relevant log output, like the command you entered and the logs leading up to the error. This will be automatically formatted into code, so no need for backticks.
render: shell
- type: input
id: graffiti
attributes:
label: Graffiti
description: Please copy and paste your graffiti.
4 changes: 3 additions & 1 deletion .github/workflows/rust_ci.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
on:
pull_request:
paths:
- "benchmarks/**"
- "ironfish-mpc/**"
- "ironfish-phase2/**"
- "ironfish-rust/**"
Expand All @@ -14,6 +15,7 @@ on:
branches:
- master
paths:
- "benchmarks/**"
- "ironfish-mpc/**"
- "ironfish-phase2/**"
- "ironfish-rust/**"
Expand Down Expand Up @@ -45,7 +47,7 @@ jobs:
- name: Check that cargo lockfile is up to date
run: |
cargo check --locked
cargo check --locked --all-targets
# Note: ironfish-zkp is does not need this due to different licensing
- name: Check for license headers for ironfish-rust
Expand Down
Loading

0 comments on commit 44a3e58

Please sign in to comment.