From 16f580b254622eb9fc8d9c37f4979976deba83bf Mon Sep 17 00:00:00 2001 From: Miles Johnson Date: Wed, 20 Dec 2023 12:38:38 -0800 Subject: [PATCH 1/2] Update deps. --- CHANGELOG.md | 10 ++ Cargo.lock | 340 ++++++++++---------------------------------- Cargo.toml | 8 +- rust-toolchain.toml | 2 +- 4 files changed, 91 insertions(+), 269 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1128db1..99e33f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # Changelog +## 0.6.0 + +#### 🚀 Updates + +- Updated to support proto v0.26 release. + +#### ⚙️ Internal + +- Updated dependencies. + ## 0.5.0 #### 🚀 Updates diff --git a/Cargo.lock b/Cargo.lock index 3a758ec..a5a9c91 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -390,28 +390,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "chrono-tz" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e23185c0e21df6ed832a12e2bda87c7d1def6842881fb634a8511ced741b0d76" -dependencies = [ - "chrono", - "chrono-tz-build", - "phf", -] - -[[package]] -name = "chrono-tz-build" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433e39f13c9a060046954e0592a8d0a4bcb1040125cbf91cb8ee58964cfb350f" -dependencies = [ - "parse-zoneinfo", - "phf", - "phf_codegen", -] - [[package]] name = "clap" version = "3.2.25" @@ -442,6 +420,16 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aaa6b4b263a5d737e9bf6b7c09b72c41a5480aec4d7219af827f6564e950b6a5" +[[package]] +name = "command-group" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a68fa787550392a9d58f44c21a3022cfb3ea3e2458b7f85d3b399d0ceeccf409" +dependencies = [ + "nix", + "winapi", +] + [[package]] name = "compact_str" version = "0.7.1" @@ -796,12 +784,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c877555693c14d2f84191cfd3ad8582790fc52b5e2274b40b59cf5f5cea25c7" -[[package]] -name = "deunicode" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a1abaf4d861455be59f64fd2b55606cb151fce304ede7165f410243ce96bde6" - [[package]] name = "diff" version = "0.1.13" @@ -1393,15 +1375,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "140a09c9305e6d5e557e2ed7cbc68e05765a7d4213975b87cb04920689cc6219" -[[package]] -name = "humansize" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cb51c9a029ddc91b07a787f1d86b53ccfa49b0e86688c946ebe8d3555685dd7" -dependencies = [ - "libm", -] - [[package]] name = "humantime" version = "2.1.0" @@ -1521,9 +1494,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", "hashbrown 0.14.2", @@ -1687,12 +1660,6 @@ version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" -[[package]] -name = "libm" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" - [[package]] name = "linked-hash-map" version = "0.5.6" @@ -1882,6 +1849,17 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "nix" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +dependencies = [ + "bitflags 2.3.3", + "cfg-if", + "libc", +] + [[package]] name = "nom" version = "7.1.3" @@ -1940,9 +1918,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "once_map" @@ -2012,15 +1990,6 @@ dependencies = [ "windows-targets 0.48.1", ] -[[package]] -name = "parse-zoneinfo" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c705f256449c60da65e11ff6626e0c16a0a0b96aaa348de61376b249bc340f41" -dependencies = [ - "regex", -] - [[package]] name = "paste" version = "1.0.14" @@ -2033,89 +2002,6 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" -[[package]] -name = "pest" -version = "2.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae9cee2a55a544be8b89dc6848072af97a20f2422603c10865be2a42b580fff5" -dependencies = [ - "memchr", - "thiserror", - "ucd-trie", -] - -[[package]] -name = "pest_derive" -version = "2.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81d78524685f5ef2a3b3bd1cafbc9fcabb036253d9b1463e726a91cd16e2dfc2" -dependencies = [ - "pest", - "pest_generator", -] - -[[package]] -name = "pest_generator" -version = "2.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68bd1206e71118b5356dae5ddc61c8b11e28b09ef6a31acbd15ea48a28e0c227" -dependencies = [ - "pest", - "pest_meta", - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "pest_meta" -version = "2.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c747191d4ad9e4a4ab9c8798f1e82a39affe7ef9648390b7e5548d18e099de6" -dependencies = [ - "once_cell", - "pest", - "sha2", -] - -[[package]] -name = "phf" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" -dependencies = [ - "phf_shared", -] - -[[package]] -name = "phf_codegen" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" -dependencies = [ - "phf_generator", - "phf_shared", -] - -[[package]] -name = "phf_generator" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" -dependencies = [ - "phf_shared", - "rand", -] - -[[package]] -name = "phf_shared" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" -dependencies = [ - "siphasher", -] - [[package]] name = "pin-project-lite" version = "0.2.12" @@ -2201,9 +2087,9 @@ dependencies = [ [[package]] name = "proto_core" -version = "0.24.0" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fd739ac06372f62e810f289a0dc7346d56534c7c0f87c8f61a149f5b2522620" +checksum = "e5011f4e9b6f476f02adeb384619092cc60f0dc6e06288232d38d5bf3f3b78b8" dependencies = [ "cached", "extism", @@ -2212,6 +2098,7 @@ dependencies = [ "minisign-verify", "once_cell", "proto_pdk_api", + "proto_shim", "regex", "reqwest", "schematic", @@ -2219,12 +2106,12 @@ dependencies = [ "serde", "serde_json", "sha2", + "shell-words", "starbase_archive", "starbase_events", "starbase_styles", "starbase_utils", "system_env", - "tera", "thiserror", "tracing", "url", @@ -2234,9 +2121,9 @@ dependencies = [ [[package]] name = "proto_pdk" -version = "0.11.0" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66a4fcd8cda70c45e5ab0faec4f48656ab02ceffc081575b8af2b416482581b9" +checksum = "f48c79d2b872cb8c7a7cdb609e3e7f214d9ee1bcf178f6a30246e9342863dd40" dependencies = [ "anyhow", "extism-pdk", @@ -2246,9 +2133,9 @@ dependencies = [ [[package]] name = "proto_pdk_api" -version = "0.11.0" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dc7331f1296d9f65c1a3ac4580f8d2c601835439bb616c07b6afaa127fde835" +checksum = "cdb30a90de48c242c147a65dff61438d55761f5e587bd611ab6e12812b19a573" dependencies = [ "anyhow", "semver", @@ -2262,9 +2149,9 @@ dependencies = [ [[package]] name = "proto_pdk_test_utils" -version = "0.12.0" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60027d4095318e5fe36443ce3d5a4f011101350ac8344d6c241cddc93bfbf0ad" +checksum = "7fad41e01bdeb45c2400a1e9fbaebef65eb54f5d3b9824cd2c54564e627bc521" dependencies = [ "extism", "proto_core", @@ -2272,6 +2159,16 @@ dependencies = [ "serde_json", ] +[[package]] +name = "proto_shim" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b50b58a1414a2ed67627ec6f2c695e8a47be3fa0ab70b49e43b6dec8523aee2" +dependencies = [ + "command-group", + "dirs 5.0.1", +] + [[package]] name = "psm" version = "0.1.21" @@ -2438,9 +2335,9 @@ checksum = "c707298afce11da2efef2f600116fa93ffa7a032b5d7b628aa17711ec81383ca" [[package]] name = "reqwest" -version = "0.11.22" +version = "0.11.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" +checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41" dependencies = [ "base64", "bytes", @@ -2515,7 +2412,7 @@ dependencies = [ [[package]] name = "rust_plugin" -version = "0.5.0" +version = "0.6.0" dependencies = [ "extism-pdk", "proto_pdk", @@ -2652,11 +2549,12 @@ dependencies = [ [[package]] name = "schematic" -version = "0.12.10" +version = "0.12.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "710a6af816c586a37dc9b8b304370f36d8b90751785bbb245942bed0ae00a69d" +checksum = "c5ed74b468686fb5551b8f29c8339dcf0b7ac4e0f475490f6f49f6a2aadcd392" dependencies = [ "garde", + "indexmap 2.1.0", "miette", "schematic_macros", "schematic_types", @@ -2686,6 +2584,10 @@ name = "schematic_types" version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c38cdd0968bde35f7e093600c90e0306da6af5ffd1b3cb175dbfde1146debcf2" +dependencies = [ + "serde_json", + "toml 0.8.8", +] [[package]] name = "scopeguard" @@ -2860,12 +2762,6 @@ version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" -[[package]] -name = "siphasher" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" - [[package]] name = "slab" version = "0.4.8" @@ -2881,16 +2777,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7" -[[package]] -name = "slug" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bd94acec9c8da640005f8e135a39fc0372e74535e6b368b7a04b875f784c8c4" -dependencies = [ - "deunicode", - "wasm-bindgen", -] - [[package]] name = "smallvec" version = "1.11.0" @@ -2937,9 +2823,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "starbase_archive" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "935856c30da2f62a73bcc57eecb5508bedd313287bc0e00e7e7c4b7a07fb5995" +checksum = "b4a0d1c404d4e987597b018bee76fb8e79937f3b2ab0cf5963ce043031092694" dependencies = [ "flate2", "miette", @@ -3111,10 +2997,11 @@ dependencies = [ [[package]] name = "system_env" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "221c4406bc1af727cb66618e377d1ed799eb59e029c93d9aabe67f4d2b67274f" +checksum = "ca213bddf34f26c2d4d76ef0a6e7f0d29d11c3246d514dc78723b8e457f9f3f9" dependencies = [ + "schematic", "serde", "serde_json", "shell-words", @@ -3161,28 +3048,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "tera" -version = "1.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "970dff17c11e884a4a09bc76e3a17ef71e01bb13447a11e85226e254fe6d10b8" -dependencies = [ - "chrono", - "chrono-tz", - "globwalk", - "humansize", - "lazy_static", - "percent-encoding", - "pest", - "pest_derive", - "rand", - "regex", - "serde", - "serde_json", - "slug", - "unic-segment", -] - [[package]] name = "termcolor" version = "1.2.0" @@ -3206,18 +3071,18 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "f11c217e1416d6f036b870f14e0413d480dbf28edbee1f877abaf0206af43bb7" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "01742297787513b79cf8e29d1056ede1313e2420b7b3b15d0a768b4921f549df" dependencies = [ "proc-macro2", "quote", @@ -3273,9 +3138,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.34.0" +version = "1.35.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" +checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" dependencies = [ "backtrace", "bytes", @@ -3373,7 +3238,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.1.0", "serde", "serde_spanned", "toml_datetime", @@ -3386,7 +3251,7 @@ version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.1.0", "serde", "serde_spanned", "toml_datetime", @@ -3452,62 +3317,6 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" -[[package]] -name = "ucd-trie" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" - -[[package]] -name = "unic-char-property" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221" -dependencies = [ - "unic-char-range", -] - -[[package]] -name = "unic-char-range" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc" - -[[package]] -name = "unic-common" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc" - -[[package]] -name = "unic-segment" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4ed5d26be57f84f176157270c112ef57b86debac9cd21daaabbe56db0f88f23" -dependencies = [ - "unic-ucd-segment", -] - -[[package]] -name = "unic-ucd-segment" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2079c122a62205b421f499da10f3ee0f7697f012f55b675e002483c73ea34700" -dependencies = [ - "unic-char-property", - "unic-char-range", - "unic-ucd-version", -] - -[[package]] -name = "unic-ucd-version" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4" -dependencies = [ - "unic-common", -] - [[package]] name = "unicase" version = "2.6.0" @@ -3621,12 +3430,13 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "version_spec" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3aaaf40ae0d800122ce8ef646ddd08ea02a42a141b249e08496e10ae3eb4440" +checksum = "460b94056fcc70bbf79dd743b91f6709e395a20d4b37bb2a929b73bd59fb24b0" dependencies = [ "human-sort", "regex", + "schematic", "semver", "serde", ] @@ -3661,9 +3471,9 @@ dependencies = [ [[package]] name = "warpgate" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a7753f1234515fcfb16f532527e6d4c3bf20a9745b89ca6d450f7ae9b04fbdd" +checksum = "422ee7bb02157d5b78c8aad4f96d4905e452da4b128fc4aec80d2597cee71d0c" dependencies = [ "extism", "miette", @@ -3671,6 +3481,7 @@ dependencies = [ "once_map", "regex", "reqwest", + "schematic", "serde", "serde_json", "sha2", @@ -3688,6 +3499,7 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5fe2fae4f5a428c7c697e057909240e376abdd45577beec6d4bd9798b451f20c" dependencies = [ + "schematic", "serde", ] @@ -3847,7 +3659,7 @@ version = "0.112.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e986b010f47fcce49cf8ea5d5f9e5d2737832f12b53ae8ae785bbe895d0877bf" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.1.0", "semver", ] diff --git a/Cargo.toml b/Cargo.toml index 820f207..b4ac19d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rust_plugin" -version = "0.5.0" +version = "0.6.0" edition = "2021" license = "MIT" publish = false @@ -10,14 +10,14 @@ crate-type = ['cdylib'] [dependencies] extism-pdk = "0.3.4" -proto_pdk = { version = "0.11.0" } # , path = "../../proto/crates/pdk" } +proto_pdk = { version = "0.12.2" } # , path = "../../proto/crates/pdk" } serde = "1.0.193" toml = "0.8.8" [dev-dependencies] -proto_pdk_test_utils = { version = "0.12.0" } # , path = "../../proto/crates/pdk-test-utils" } +proto_pdk_test_utils = { version = "0.14.4" } # , path = "../../proto/crates/pdk-test-utils" } starbase_sandbox = "0.1.12" -tokio = { version = "1.34.0", features = ["full"] } +tokio = { version = "1.35.1", features = ["full"] } [profile.release] codegen-units = 1 diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 89705a9..24cfcbd 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] profile = "default" -channel = "1.74.0" +channel = "1.74.1" From 37114814d216e5ec6cca99a0c41d03da7cb60ab2 Mon Sep 17 00:00:00 2001 From: Miles Johnson Date: Wed, 20 Dec 2023 12:41:15 -0800 Subject: [PATCH 2/2] Update workflow. --- .github/workflows/ci.yml | 11 ++++++++--- .github/workflows/release.yml | 1 - Cargo.toml | 4 ++++ src/lib.rs | 13 ++++--------- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6aa88e6..8eda2ea 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,6 +18,7 @@ jobs: - uses: actions/checkout@v3 - uses: moonrepo/setup-rust@v1 with: + cache: false components: rustfmt - run: cargo fmt --all --check lint: @@ -31,6 +32,7 @@ jobs: - uses: actions/checkout@v3 - uses: moonrepo/setup-rust@v1 with: + cache: false components: clippy - run: cargo clippy --workspace --all-targets test: @@ -44,7 +46,10 @@ jobs: - uses: actions/checkout@v3 - uses: moonrepo/setup-rust@v1 with: - bins: cargo-wasi, cargo-nextest + bins: cargo-nextest cache: false - - run: cargo wasi build - - run: cargo nextest run + - uses: moonrepo/setup-toolchain@v0 + with: + proto-version: 0.26.0-rc.2 + - uses: moonrepo/build-proto-plugin@v0 + - run: cargo nextest run --no-default-features diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 683752b..4da0eb2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,7 +18,6 @@ jobs: - uses: moonrepo/setup-rust@v1 with: cache: false - targets: wasm32-wasi - uses: moonrepo/build-proto-plugin@v0 - if: ${{ github.event_name == 'push' && github.ref_type == 'tag' }} uses: ncipollo/release-action@v1 diff --git a/Cargo.toml b/Cargo.toml index b4ac19d..a333285 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,6 +19,10 @@ proto_pdk_test_utils = { version = "0.14.4" } # , path = "../../proto/crat starbase_sandbox = "0.1.12" tokio = { version = "1.35.1", features = ["full"] } +[features] +default = ["wasm"] +wasm = [] + [profile.release] codegen-units = 1 debug = false diff --git a/src/lib.rs b/src/lib.rs index 8d89e9a..4620c58 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,13 +1,8 @@ -mod toolchain_toml; - -// WASM cannot be executed through the test runner and we need to avoid building -// WASM code for non-WASM targets. We can solve both of these with a cfg flag. - -#[cfg(not(test))] +#[cfg(feature = "wasm")] mod helpers; - -#[cfg(not(test))] +#[cfg(feature = "wasm")] mod proto; +mod toolchain_toml; -#[cfg(not(test))] +#[cfg(feature = "wasm")] pub use proto::*;