Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into remove-cargo-component
Browse files Browse the repository at this point in the history
# Conflicts:
#	Cargo.lock
#	providers/pulumi_wasm_provider_cloudflare/src/lib.rs
#	providers/pulumi_wasm_provider_docker/src/lib.rs
#	providers/pulumi_wasm_provider_random/src/lib.rs
#	pulumi_wasm_generator_lib/src/output/provider/lib.rs.handlebars
#	pulumi_wasm_generator_lib/tests/output/cyclic-types/rust-toolchain.toml
#	pulumi_wasm_generator_lib/tests/output/functions-secrets/rust-toolchain.toml
#	pulumi_wasm_generator_lib/tests/output/mini-awsnative/rust-toolchain.toml
#	rust-toolchain.toml
  • Loading branch information
andrzejressel committed Dec 2, 2024
2 parents 7baa75f + ea61f72 commit beac926
Show file tree
Hide file tree
Showing 219 changed files with 40,778 additions and 27,207 deletions.
3 changes: 2 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
* text=auto eol=lf
* text=auto eol=lf
providers/**/* linguist-generated=true
10 changes: 0 additions & 10 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,12 @@ prost-types = "0.13.1"
uuid = { version = "1.8.0", features = ["v4", "v7"] }
futures = "0.3.30"
once_cell = "1.19.0"
bitflags = "2.5.0"
wit-bindgen = "0.36.0"
wit-bindgen-rt = "0.36.0"
serde = { version = "1.0.200", features = ["derive"] }
serde_json = { version = "1.0.120" }
tonic = { version = "0.12.0", default-features = false }
tonic-build = "0.12.0"
tonic-web = "0.12.0"
wasmtime = "27.0.0"
wasmtime-wasi = "27.0.0"
async-trait = "0.1.80"
Expand All @@ -75,16 +73,9 @@ clap = { version = "4.5.4", features = ["derive"] }
regex = "1.10.4"
syn = { version = "2.0.60", features = ["full"] }
quote = "1.0.36"
proc-macro2 = "1.0.81"
assert_cmd = "2.0.14"
predicates = "3.1.0"
normpath = "1.2"
simple_logger = "5.0.0"
petgraph = "0.6.4"
cargo_metadata = "0.19.0"
itertools = "0.13.0"
testdir = "0.9.1"
fs_extra = "1.3.0"
handlebars = "6.0.0"
convert_case = "0.6.0"
mockall = "0.13.0"
Expand All @@ -95,5 +86,4 @@ directories = "5.0"
reqwest = "0.12.5"
wit-component = "0.221.0"
wit-parser = "0.221.0"
wasmprinter = "0.221.0"
bon = "3.0.0"
2 changes: 2 additions & 0 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ publish-providers:

test:
cargo nextest run --profile ci --workspace --timings
just rust-docs

test-coverage:
cargo llvm-cov --no-report -p pulumi_wasm_core -p pulumi_wasm_generator_lib
Expand All @@ -129,6 +130,7 @@ docs:

# DO NOT EDIT - GENERATE-RUST-DOCS - START
rust-docs:
cargo test --doc -p pulumi_wasm_random -p pulumi_wasm_cloudflare
cargo doc --no-deps -p pulumi_wasm_rust -p pulumi_wasm_docker -p pulumi_wasm_random -p pulumi_wasm_cloudflare
# DO NOT EDIT - GENERATE-RUST-DOCS - END

Expand Down

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

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

Loading

0 comments on commit beac926

Please sign in to comment.