Skip to content

Commit

Permalink
Merge branch 'master' into feat/cost-tracking
Browse files Browse the repository at this point in the history
  • Loading branch information
MujkicA authored Oct 29, 2024
2 parents b10cf48 + 5c17ae7 commit 41e367f
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 41 deletions.
21 changes: 21 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,26 @@ jobs:
- name: Unit/integration tests
run: cargo test --workspace --exclude e2e

additional-check-for-published-crates:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
token: ${{ secrets.GITHUB_TOKEN }}

- name: Setup Rust
uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.RUST_VERSION }}

- name: Setup cargo hack
uses: taiki-e/install-action@cargo-hack

- name: Run cargo hack to check for invalid feature flag combinations
working-directory: packages/encoding
run: cargo hack --feature-powerset --no-dev-deps check

e2e-release-build:
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -315,6 +335,7 @@ jobs:
publish:
needs:
- cargo-verifications
- additional-check-for-published-crates
- publish-crates-check
# Only do this job if publishing a release
if: github.event_name == 'release' && github.event.action == 'published'
Expand Down
55 changes: 16 additions & 39 deletions Cargo.lock

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

4 changes: 2 additions & 2 deletions packages/encoding/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ publish = true
# alloy only really needed when generating proofs, and since the core doesn't
# need to do that we've gated it behing the `kzg` feature flag.
alloy = { workspace = true, features = ["consensus", "eips"], optional = true }
anyhow = { workspace = true }
anyhow = { workspace = true, features = ["default"] }
bitvec = { workspace = true, features = ["default"] }
c-kzg = { workspace = true }
flate2 = { workspace = true, features = ["default"] }
hex = { workspace = true }
itertools = { workspace = true, features = ["use_std"] }
postcard = { workspace = true, features = ["alloc"] }
postcard = { workspace = true, features = ["use-std"] }
serde = { workspace = true }
static_assertions = { workspace = true }

Expand Down

0 comments on commit 41e367f

Please sign in to comment.