Skip to content

Commit

Permalink
Merge pull request #100 from EspressoSystems/rm/update-hotshot
Browse files Browse the repository at this point in the history
Update HotShot, remove capn proto
  • Loading branch information
rob-maron authored Apr 25, 2024
2 parents 46aedad + 7c64437 commit 2106381
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 49 deletions.
8 changes: 0 additions & 8 deletions .github/actions/install-capnp/action.yml

This file was deleted.

3 changes: 0 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@ jobs:
- name: Install Protoc
uses: arduino/setup-protoc@v2

- name: Install capnproto
uses: ./.github/actions/install-capnp

- uses: dtolnay/rust-toolchain@stable

- name: Configure Git
Expand Down
15 changes: 0 additions & 15 deletions .github/workflows/build_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,18 +40,6 @@ jobs:
- name: Install Protoc
uses: arduino/setup-protoc@v2

# Will this work?
- name: Install Cap'n Proto
run: |
curl https://capnproto.org/capnproto-c++-win32-1.0.2.zip -o capnproto.zip
7z.exe e capnproto.zip -r *.exe -o${{github.workspace}}\capnproto
Write-Output "Unpacking capnp.exe to ${{github.workspace}}\capnproto\"
Get-ChildItem -Path ${{github.workspace}}\capnproto\
echo "${{github.workspace}}\capnproto" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
$env:Path += ';${{github.workspace}}\capnproto'
Get-Command capnp -All
capnp --version
- name: Checkout Repository
uses: actions/checkout@v4

Expand All @@ -60,9 +48,6 @@ jobs:

- name: Build
run: |
Get-ChildItem -Path ${{github.workspace}}\capnproto\
$env:Path += ';${{github.workspace}}\capnproto'
capnp --version
cargo build --workspace --release
- name: Test
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/debug_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@ jobs:
- name: Install Protoc
uses: arduino/setup-protoc@v2

- name: Install capnproto
uses: ./.github/actions/install-capnp

- uses: dtolnay/rust-toolchain@stable

- uses: styfle/cancel-workflow-action@0.12.0
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,6 @@ jobs:
- name: Install Protoc
uses: arduino/setup-protoc@v2

- name: Install capnproto
uses: ./.github/actions/install-capnp

- uses: dtolnay/rust-toolchain@stable

- name: Configure Git
Expand Down
23 changes: 12 additions & 11 deletions Cargo.lock

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

10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ async-trait = "0.1"
clap = { version = "4.4", features = ["derive", "env"] }
committable = "0.2"
futures = "0.3"
hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.43" }
hotshot-builder-api = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.43" }
hotshot-events-service = { git = "https://github.com/EspressoSystems/hotshot-events-service.git", tag = "0.1.12" }
hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.43" }
hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.44" }
hotshot-builder-api = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.44" }
hotshot-events-service = { git = "https://github.com/EspressoSystems/hotshot-events-service.git", tag = "0.1.13" }
hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.44" }
serde = { version = "1.0", features = ["derive"] }
sha2 = "0.10"
snafu = "0.8"
Expand All @@ -29,4 +29,4 @@ tracing = "0.1"
vbs = "0.1"

[dev-dependencies]
hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.43" }
hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.44" }
1 change: 0 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,6 @@
nixpkgs-fmt
git
mdbook # make-doc, documentation generation
capnproto
protobuf
rustToolchain
] ++ myPython ++ rustDeps;
Expand Down

0 comments on commit 2106381

Please sign in to comment.