Skip to content

Commit

Permalink
Merge branch 'master' into cl/issue-4133
Browse files Browse the repository at this point in the history
  • Loading branch information
clearloop committed Aug 19, 2024
2 parents f9a040b + b710fb8 commit 0060c3b
Show file tree
Hide file tree
Showing 36 changed files with 864 additions and 153 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ jobs:
cargo +stable check --manifest-path utils/wasm-builder/test-program/Cargo.toml
cargo +stable check --manifest-path utils/cargo-gbuild/test-program/Cargo.toml --workspace --target wasm32-unknown-unknown
- name: "Check: crates-io packages"
run: cargo +stable run --release -p crates-io check
- name: "Check: crates-io packages publishing"
run: cargo +stable run --release -p crates-io publish --simulate --registry-path /tmp/cargo-http-registry

fuzzer:
runs-on: [kuberunner, github-runner-01]
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/crates-io.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ jobs:
targets: wasm32-unknown-unknown
components: llvm-tools

- name: "Check packages"
- name: "Publish packages (simulate)"
if: ${{ !inputs.publish }}
run: cargo +stable run -p crates-io check
run: cargo +stable run --release -p crates-io publish -v ${{ inputs.version }} --simulate --registry-path /tmp/cargo-http-registry

- name: "Publish packages"
if: ${{ inputs.publish }}
run: cargo +stable run -p crates-io publish -v ${{ inputs.version }}
run: cargo +stable run --release -p crates-io publish -v ${{ inputs.version }}
206 changes: 204 additions & 2 deletions Cargo.lock

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

3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ resolver = "2"

default-members = ["node/cli"]

exclude = ["ethexe/contracts", "ethexe/docker"]
exclude = ["ethexe/contracts", "ethexe/docker", "ethexe/scripts"]

members = [
"common",
Expand Down Expand Up @@ -502,6 +502,7 @@ demo-wat = { path = "examples/wat" }
# TODO: remove these dependencies (from this file?) or add more docs.

cfg-if = "1.0.0" # gear-lazy-pages
cargo-http-registry = "0.1.6" # crates-io
errno = "0.3" # gear-lazy-pages
nix = "0.26.4" # gear-lazy-pages
indexmap = "2.2.6" # utils/weight-diff
Expand Down
Loading

0 comments on commit 0060c3b

Please sign in to comment.