Skip to content

Commit

Permalink
Zsa1 upsteram merge (#63)
Browse files Browse the repository at this point in the history
Zsa1 is updated to a more current upstream version, commit:
c3eace4
  • Loading branch information
alexeykoren authored Jun 26, 2024
1 parent 3554273 commit f10ae22
Show file tree
Hide file tree
Showing 241 changed files with 43,471 additions and 26,137 deletions.
7 changes: 7 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# EditorConfig is awesome:http://EditorConfig.org

# top-most EditorConfig file
root = true

[*.md]
indent_style = space
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
zcash_client_backend/src/proto/compact_formats.rs linguist-generated=true
zcash_client_backend/src/proto/service.rs linguist-generated=true
zcash_client_backend/src/proto/proposal.rs linguist-generated=true
36 changes: 36 additions & 0 deletions .github/actions/prepare/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: 'Prepare CI'
description: 'Prepares feature flags'
inputs:
extra-features:
description: 'Extra feature flags to enable'
required: false
default: ''
test-dependencies:
description: 'Include test dependencies'
required: false
default: true
outputs:
feature-flags:
description: 'Feature flags'
value: ${{ steps.prepare.outputs.flags }}
runs:
using: 'composite'
steps:
- id: test
shell: bash
run: echo "feature=test-dependencies" >> $GITHUB_OUTPUT
if: inputs.test-dependencies == 'true'
- name: Prepare feature flags
id: prepare
shell: bash
run: >
echo "flags=--features '
bundled-prover
download-params
temporary-zcashd
transparent-inputs
sapling
unstable
${{ inputs.extra-features }}
${{ steps.test.outputs.feature }}
'" >> $GITHUB_OUTPUT
24 changes: 24 additions & 0 deletions .github/workflows/aggregate-audits.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Aggregate audits

on:
push:
branches: main
paths:
- '.github/workflows/aggregate-audits.yml'
- 'supply-chain/audits.toml'

permissions:
contents: read

jobs:
trigger:
name: Trigger
runs-on: ubuntu-latest
steps:
- name: Trigger aggregation in zcash/rust-ecosystem
run: >
gh api repos/zcash/rust-ecosystem/dispatches
--field event_type="aggregate-audits"
--field client_payload[sha]="$GITHUB_SHA"
env:
GH_TOKEN: ${{ github.token }}
30 changes: 30 additions & 0 deletions .github/workflows/audits.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Audits

on:
pull_request:
push:
branches: main

permissions:
contents: read

jobs:
cargo-vet:
name: Vet Rust dependencies
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
id: toolchain
- run: rustup override set ${{steps.toolchain.outputs.name}}
- run: cargo install cargo-vet --version ~0.9
- run: cargo vet --locked

cargo-deny:
name: Check licenses
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: EmbarkStudios/cargo-deny-action@v1
with:
command: check licenses
12 changes: 9 additions & 3 deletions .github/workflows/book.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,19 @@ jobs:
deploy:
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- id: prepare
uses: ./.github/actions/prepare
- uses: dtolnay/rust-toolchain@nightly
id: toolchain
- run: rustup override set ${{steps.toolchain.outputs.name}}

- name: Build latest rustdocs
run: cargo doc --no-deps --workspace --all-features
run: >
cargo doc
--no-deps
--workspace
${{ steps.prepare.outputs.feature-flags }}
env:
RUSTDOCFLAGS: -Z unstable-options --enable-index-page --cfg docsrs

Expand All @@ -25,7 +31,7 @@ jobs:
mv ./target/doc ./book/book/rustdoc/latest
- name: Deploy to GitHub Pages
uses: peaceiris/actions-gh-pages@v3
uses: peaceiris/actions-gh-pages@v4
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./book/book
Loading

0 comments on commit f10ae22

Please sign in to comment.