Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
43b5e50
Prepare to use Orchard ZSA
dmidem Jul 29, 2024
95dce56
Switch Zebra to QED-it ZSA-compatible crates but maintain the origina…
dmidem Aug 11, 2024
51009ae
Merge branch 'main' into zsa-integration-zsadeps-old
dmidem Oct 29, 2024
2fabac7
Prepare to use Orchard ZSA
dmidem Jul 29, 2024
836516d
Add basic CI checks workflow
dmidem Sep 3, 2024
e29a64c
Fix ci-basic.yml
dmidem Sep 3, 2024
790072d
Fix ci-basic.yml (2)
dmidem Sep 3, 2024
7695882
Add installing of build-essential to ci-basic.yml
dmidem Sep 3, 2024
9a8d37e
Try to use librocksdb-dev in ci-basic.yml
dmidem Sep 3, 2024
925e81a
Run ci-basic.yml on ubuntu-24.04
dmidem Sep 3, 2024
61f9f95
Enable nu6 cfg flag in ci-basic.yml
dmidem Sep 3, 2024
2e9c089
Adjust the code with librustzcash/zcash_protocol nu6 related changes
dmidem Sep 4, 2024
0dce1a4
Add RUSTDOCFLAGS to ci-basic.yml
dmidem Sep 4, 2024
77e9d4d
Merge branch 'zsa1' into zsa-integration-zsadeps-old
dmidem Oct 29, 2024
e294837
Set Rust cfg zcash_unstable to nu6 in .cargo/config.toml
dmidem Oct 29, 2024
9f55f35
Disable GCP/Firebase/Docker/deploy related workflows (add .disabled s…
dmidem Oct 29, 2024
6b43dd1
Trigger CI
dmidem Oct 29, 2024
c6f8913
Restore the names of ci-*.yml files )i.e. non GCP/Firebase/Docker/dep…
dmidem Oct 29, 2024
1c061e9
Update Cargo.lock
dmidem Oct 29, 2024
8c76592
Use zsa1 branch for librustzcash crates
dmidem Oct 29, 2024
bba5fd5
Update zebra-consensus/src/primitives/halo2/tests.rs
dmidem Feb 10, 2025
6118303
Update zebra-chain/src/orchard/note/ciphertexts.rs
dmidem Feb 10, 2025
e97f991
Use zcash_unstable = nu6 TODO nu7 as nu6 cfg attribute
dmidem Feb 10, 2025
a5980e7
Add TODO comment for bridgetree dependency downgrading
dmidem Feb 10, 2025
a0241d8
Add ENABLE_ZSA orchard flag
dmidem Feb 10, 2025
f74671e
Update zebra-consensus/src/primitives/halo2.rs
dmidem Feb 10, 2025
56a445f
Remove resolved FIXMEs
dmidem Feb 10, 2025
eb7f1d1
Merge branch 'zsa-integration-zsadeps' of https://github.com/QED-it/z…
dmidem Feb 10, 2025
25c5486
Remove resolved FIXMEs (2)
dmidem Feb 10, 2025
cfaac4b
Update librustzcash and orchard version hashes in Cargo.lock, make a …
dmidem Feb 11, 2025
6b7e665
Fix consenus test to use the new orchard builder return type
dmidem Feb 11, 2025
10f3740
Update librustzcash commit in Cargo.lock
dmidem Feb 13, 2025
998a2c7
Update zebra-chain to sync with the updated librustzcash (zcash_primi…
dmidem Feb 13, 2025
90c8847
Removed previousely added unused variables
dmidem Feb 13, 2025
642776f
Add lints.rust/unexpected_cfgs into zebra-chain Cargo.toml to avoid c…
dmidem Feb 13, 2025
9f80f6d
Pin Rust version to 1.82.0 by adding rust-toolchain.toml file, to avo…
dmidem Feb 13, 2025
526e92d
Pin Rust version to 1.82.0 by adding rust-toolchain.toml file, to avo…
dmidem Feb 13, 2025
a999d70
Revert "Update zebra-chain to sync with the updated librustzcash (zca…
dmidem Feb 14, 2025
daeb0f0
Revert "Update librustzcash and orchard version hashes in Cargo.lock,…
dmidem Feb 14, 2025
49f0a9c
Revert "Fix consenus test to use the new orchard builder return type"
dmidem Feb 14, 2025
de8dab5
Add --cfg zcash_unstable flag to rustdocflags of .cargo/config.toml
dmidem Feb 17, 2025
944df50
Remove RUSTFLAGS and RUSTDOCFLAGS from CI config as they override .ca…
dmidem Feb 17, 2025
ddadae9
Change unfixed FIXMEs to TODOs
dmidem Feb 18, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
# Flags that apply to all Zebra crates and configurations
[target.'cfg(all())']
rustflags = [
# TODO: Consider removing this line later (it's needed for the ZSA version of librustzcash crates)
"--cfg", "zcash_unstable=\"nu6\"",

# Zebra standard lints for Rust 1.65+

# High-risk code
Expand Down Expand Up @@ -82,6 +85,9 @@ rustflags = [

[build]
rustdocflags = [
# TODO: Consider removing this line later (it's needed for the ZSA version of librustzcash crates)
"--cfg", "zcash_unstable=\"nu6\"",

# The -A and -W settings must be the same as the `RUSTDOCFLAGS` in:
# https://github.com/ZcashFoundation/zebra/blob/main/.github/workflows/docs-deploy-firebase.yml#L68

Expand Down
32 changes: 32 additions & 0 deletions .github/workflows/ci-basic.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Basic checks

#on: [push, pull_request]
on: [push]

jobs:
test:
name: Test on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-24.04]

env:
# Use system-installed RocksDB library instead of building from scratch
ROCKSDB_LIB_DIR: /usr/lib
# Use system-installed Snappy library for compression in RocksDB
SNAPPY_LIB_DIR: /usr/lib/x86_64-linux-gnu

steps:
- uses: actions/checkout@v4
- name: Install dependencies on Ubuntu
#run: sudo apt-get update && sudo apt-get install -y protobuf-compiler build-essential librocksdb-dev
run: sudo apt-get update && sudo apt-get install -y protobuf-compiler librocksdb-dev
- name: Run tests
run: cargo test --verbose
- name: Verify working directory is clean
run: git diff --exit-code
- name: Run doc check
run: cargo doc --all-features --document-private-items
- name: Run format check
run: cargo fmt -- --check
Loading