Skip to content

Commit

Permalink
Merge branch 'main' into feat/display-discreetly
Browse files Browse the repository at this point in the history
Signed-off-by: Halimao <[email protected]>
  • Loading branch information
Halimao authored Mar 3, 2024
2 parents 2743c53 + 6f8f2cb commit 1f4f5b2
Show file tree
Hide file tree
Showing 226 changed files with 5,670 additions and 6,817 deletions.
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# re-add directories explicitly.
**/
!crates/
!assets/
!Cargo.toml
!Cargo.lock
!.cargo/
Expand Down
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
*.bin filter=lfs diff=lfs merge=lfs -text
assets/** filter=lfs diff=lfs merge=lfs -text
8 changes: 1 addition & 7 deletions .github/workflows/notes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,8 @@ jobs:
uses: actions/checkout@v4
with:
lfs: true

- name: Install rust toolchain
# The script for rustdoc build requires nightly toolchain.
uses: dtolnay/rust-toolchain@master
with:
# TODO 2024-02-06: this is pinned due to tkaitchuck/aHash#200, see GH3750.
toolchain: nightly-2024-02-01

uses: dtolnay/rust-toolchain@nightly
- name: Load Rust caching
uses: astriaorg/[email protected]
- name: Load get-version action to grab version component of deployment path
Expand Down
51 changes: 0 additions & 51 deletions .github/workflows/npm.yml

This file was deleted.

46 changes: 2 additions & 44 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,50 +65,8 @@ jobs:
lfs: true
- name: Install rust toolchain
# The script for rustdoc build requires nightly toolchain.
uses: dtolnay/rust-toolchain@master
with:
# TODO 2024-02-06: this is pinned due to tkaitchuck/aHash#200, see GH3750.
toolchain: nightly-2024-02-01
uses: dtolnay/rust-toolchain@nightly
- name: Load rust cache
uses: astriaorg/[email protected]
- name: Build rustdocs
run: ./deployments/scripts/rust-docs

wasm:
name: Build WASM
runs-on: buildjet-16vcpu-ubuntu-2204
steps:
- uses: actions/checkout@v4
with:
lfs: true
- name: Install rust toolchain
uses: dtolnay/rust-toolchain@stable
with:
targets: wasm32-unknown-unknown

- name: Load rust cache
uses: astriaorg/[email protected]

# Download prebuilt binary for wasm-pack; faster than `cargo install`.
- uses: jetli/[email protected]
with:
version: 'latest'

# Ensure that wasm crate builds cleanly. Is this superfluous, given `wasm-pack test` below?
- name: run wasm-pack build
run: wasm-pack build
working-directory: crates/wasm

# Download firefox
- uses: browser-actions/setup-firefox@v1
- run: firefox --version

- name: Run headless browser tests
run: wasm-pack test --headless --firefox -- --test test_build --target wasm32-unknown-unknown --release --features "mock-database"
working-directory: crates/wasm

# Always show the results of `cargo tree`, even if the tests failed, since that
# output will be immediately useful in debugging.
- name: display mio deps
run: cargo tree --invert mio --edges features
if: always()
run: ./deployments/scripts/rust-docs
5 changes: 4 additions & 1 deletion .github/workflows/smoke.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,12 @@ jobs:
- name: Display comet logs
if: always()
run: cat deployments/logs/comet.log
- name: Display pd logs
- name: Display pd runtime logs
if: always()
run: cat deployments/logs/pd.log
- name: Display pd test logs
if: always()
run: cat deployments/logs/pd-tests.log
- name: Display pclientd logs
if: always()
run: cat deployments/logs/pclientd.log
Expand Down
6 changes: 3 additions & 3 deletions COMPATIBILITY.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
| Application version (Name)| Penumbra crate version | CometBFT |
| -------- | -------- | -------- |
| 1 (Testnet 64) | v0.64.0 | v0.37.2 |
| Application version (Name)| Penumbra crate version | CometBFT | Protobuf |
| ------------------------- | ---------------------- | -------- | -------- |
| 1 (Testnet 68) | v0.68.0 | v0.37.2 | v1 |
Loading

0 comments on commit 1f4f5b2

Please sign in to comment.