From d243f19e25c08fe1dd127e88938bd9658948ff0f Mon Sep 17 00:00:00 2001 From: Aaron Fenyes Date: Tue, 11 Mar 2025 14:51:16 -0700 Subject: [PATCH 01/23] Start tracking `Cargo.lock` --- app-proto/Cargo.lock | 788 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 788 insertions(+) create mode 100644 app-proto/Cargo.lock diff --git a/app-proto/Cargo.lock b/app-proto/Cargo.lock new file mode 100644 index 0000000..9738589 --- /dev/null +++ b/app-proto/Cargo.lock @@ -0,0 +1,788 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "allocator-api2" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" + +[[package]] +name = "approx" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" +dependencies = [ + "num-traits", +] + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "bytemuck" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "cc" +version = "1.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" +dependencies = [ + "shlex", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "console_error_panic_hook" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" +dependencies = [ + "cfg-if", + "wasm-bindgen", +] + +[[package]] +name = "dyna3" +version = "0.1.0" +dependencies = [ + "console_error_panic_hook", + "dyna3", + "itertools", + "js-sys", + "lazy_static", + "nalgebra", + "readonly", + "rustc-hash", + "slab", + "sycamore", + "wasm-bindgen-test", + "web-sys", +] + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash", + "allocator-api2", +] + +[[package]] +name = "html-escape" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d1ad449764d627e22bfd7cd5e8868264fc9236e07c752972b4080cd351cb476" +dependencies = [ + "utf8-width", +] + +[[package]] +name = "indexmap" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + +[[package]] +name = "js-sys" +version = "0.3.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "libc" +version = "0.2.158" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "matrixmultiply" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9380b911e3e96d10c1f415da0876389aaf1b56759054eeb0de7df940c456ba1a" +dependencies = [ + "autocfg", + "rawpointer", +] + +[[package]] +name = "minicov" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c71e683cd655513b99affab7d317deb690528255a0d5f717f1024093c12b169" +dependencies = [ + "cc", + "walkdir", +] + +[[package]] +name = "nalgebra" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c4b5f057b303842cf3262c27e465f4c303572e7f6b0648f60e16248ac3397f4" +dependencies = [ + "approx", + "matrixmultiply", + "nalgebra-macros", + "num-complex", + "num-rational", + "num-traits", + "simba", + "typenum", +] + +[[package]] +name = "nalgebra-macros" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "254a5372af8fc138e36684761d3c0cdb758a4410e938babcff1c860ce14ddbfc" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" +dependencies = [ + "num-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[package]] +name = "ppv-lite86" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rawpointer" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" + +[[package]] +name = "readonly" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2a62d85ed81ca5305dc544bd42c8804c5060b78ffa5ad3c64b0fb6a8c13d062" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "rustc-hash" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" + +[[package]] +name = "safe_arch" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3460605018fdc9612bce72735cba0d27efbcd9904780d44c7e3a9948f96148a" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "simba" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3a386a501cd104797982c15ae17aafe8b9261315b5d07e3ec803f2ea26be0fa" +dependencies = [ + "approx", + "num-complex", + "num-traits", + "paste", + "wide", +] + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "slotmap" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" +dependencies = [ + "version_check", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "sycamore" +version = "0.9.0-beta.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dedaf7237c05913604a5b0b2536b613f6c8510c6b213d2583b1294869755cabd" +dependencies = [ + "hashbrown", + "indexmap", + "paste", + "sycamore-core", + "sycamore-macro", + "sycamore-reactive", + "sycamore-web", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "sycamore-core" +version = "0.9.0-beta.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5ddddc3d1bcb38c04ad55d2d1ab4f6a358e4daaeae0a0436892f1fade9fb31a" +dependencies = [ + "hashbrown", + "paste", + "sycamore-reactive", +] + +[[package]] +name = "sycamore-macro" +version = "0.9.0-beta.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77181c27cb753e86065308901871ccc7456fb19527b6a4ffacad3b63175ed014" +dependencies = [ + "once_cell", + "proc-macro2", + "quote", + "rand", + "sycamore-view-parser", + "syn", +] + +[[package]] +name = "sycamore-reactive" +version = "0.9.0-beta.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7aa6870203507c07e850687c0ccf528eb0f04240e3596bac9137007ffb6c50b1" +dependencies = [ + "paste", + "slotmap", + "smallvec", +] + +[[package]] +name = "sycamore-view-parser" +version = "0.9.0-beta.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6144640af2eafffc68a92f3aacbbfaa21f7fd31906e2336fe304fd100fe226b" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "sycamore-web" +version = "0.9.0-beta.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bca93dcf1b1830bf1aac93508ed51babcda92c1d32d96067ab416d94e4b7c475" +dependencies = [ + "html-escape", + "js-sys", + "once_cell", + "paste", + "smallvec", + "sycamore-core", + "sycamore-macro", + "sycamore-reactive", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "syn" +version = "2.0.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "unicode-ident" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" + +[[package]] +name = "utf8-width" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +dependencies = [ + "cfg-if", + "once_cell", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" + +[[package]] +name = "wasm-bindgen-test" +version = "0.3.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68497a05fb21143a08a7d24fc81763384a3072ee43c44e86aad1744d6adef9d9" +dependencies = [ + "console_error_panic_hook", + "js-sys", + "minicov", + "scoped-tls", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-bindgen-test-macro", +] + +[[package]] +name = "wasm-bindgen-test-macro" +version = "0.3.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b8220be1fa9e4c889b30fd207d4906657e7e90b12e0e6b0c8b8d8709f5de021" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "web-sys" +version = "0.3.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "wide" +version = "0.7.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b828f995bf1e9622031f8009f8481a85406ce1f4d4588ff746d872043e855690" +dependencies = [ + "bytemuck", + "safe_arch", +] + +[[package]] +name = "winapi-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] -- 2.43.0 From bbfdf2b87f562772aa02b0b90627f14fe60887cc Mon Sep 17 00:00:00 2001 From: Aaron Fenyes Date: Thu, 6 Mar 2025 22:24:52 -0800 Subject: [PATCH 02/23] Prototype a continuous integration workflow This workflow is too spendthrift for deployment: every job sets up Rust, and the `build` job also installs Trunk, which takes even more resources. The workflow serves well, however, as a proof of concept. Introducing a syntax error into `src/main.rs` causes the `build` and `test` jobs to fail, but allows `run-examples` to succeed. Similarly, introducing a syntax error into `examples/point-on-sphere.rs` causes `run-examples` to fail, but allows the other jobs to succeed. --- .forgejo/run-examples/action.yaml | 12 +++++++++ .forgejo/setup-rust/action.yaml | 10 ++++++++ .../workflows/continuous-integration.yaml | 25 +++++++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 .forgejo/run-examples/action.yaml create mode 100644 .forgejo/setup-rust/action.yaml create mode 100644 .forgejo/workflows/continuous-integration.yaml diff --git a/.forgejo/run-examples/action.yaml b/.forgejo/run-examples/action.yaml new file mode 100644 index 0000000..815e936 --- /dev/null +++ b/.forgejo/run-examples/action.yaml @@ -0,0 +1,12 @@ +# run all Cargo examples, as described here: +# +# Karol Kuczmarski. "Add examples to your Rust libraries" +# http://xion.io/post/code/rust-examples.html +# +runs: + using: "composite" + steps: + - run: cd app-proto; cargo run --example irisawa-hexlet + - run: cd app-proto; cargo run --example three-spheres + - run: cd app-proto; cargo run --example point-on-sphere + - run: cd app-proto; cargo run --example kaleidocycle \ No newline at end of file diff --git a/.forgejo/setup-rust/action.yaml b/.forgejo/setup-rust/action.yaml new file mode 100644 index 0000000..6960dc4 --- /dev/null +++ b/.forgejo/setup-rust/action.yaml @@ -0,0 +1,10 @@ +# set up the Rust toolchain. based on David Tolnay's more general +# `rust-toolchain` action for GitHub +# +# https://github.com/dtolnay/rust-toolchain +# +runs: + using: "composite" + steps: + - run: curl --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused --location --silent --show-error --fail 'https://sh.rustup.rs' | sh -s -- -y --profile minimal + - run: echo $HOME/.cargo/bin >> $GITHUB_PATH \ No newline at end of file diff --git a/.forgejo/workflows/continuous-integration.yaml b/.forgejo/workflows/continuous-integration.yaml new file mode 100644 index 0000000..f821b1d --- /dev/null +++ b/.forgejo/workflows/continuous-integration.yaml @@ -0,0 +1,25 @@ +on: + pull_request: + push: + branches: [main] +jobs: + build: + runs-on: docker + steps: + - uses: https://code.forgejo.org/actions/checkout@v4 + - uses: ./.forgejo/setup-rust + - run: rustup target add wasm32-unknown-unknown + - run: cargo install trunk + - run: cd app-proto; trunk build + test: + runs-on: docker + steps: + - uses: https://code.forgejo.org/actions/checkout@v4 + - uses: ./.forgejo/setup-rust + - run: cd app-proto; cargo test + run-examples: + runs-on: docker + steps: + - uses: https://code.forgejo.org/actions/checkout@v4 + - uses: ./.forgejo/setup-rust + - uses: ./.forgejo/run-examples \ No newline at end of file -- 2.43.0 From 4442dd860b57e29e1c041de2e25eaa0fcfd8a855 Mon Sep 17 00:00:00 2001 From: Aaron Fenyes Date: Fri, 7 Mar 2025 01:25:30 -0800 Subject: [PATCH 03/23] Run continuous integration on a custom image Write a Dockerfile that describes a Debian image with our build environment set up in it. Write a script that builds and tags the custom image. Set the continuous integration workflow to run on the custom image, pulled from Docker's local image store. Running the examples on the custom image takes the same steps as running them on a development machine, so we no longer gain anything from factoring out the `cargo run --example` steps. That means we can get rid of the `run-examples` action. Since the build environment is now set up ahead of time, we can get rid of the `setup-rust` action too. --- .forgejo/run-examples/action.yaml | 12 ------ .forgejo/setup-rust/action.yaml | 10 ----- .../workflows/continuous-integration.yaml | 39 +++++++++++++++---- tools/ci-image/Dockerfile | 4 ++ tools/ci-image/build | 5 +++ 5 files changed, 40 insertions(+), 30 deletions(-) delete mode 100644 .forgejo/run-examples/action.yaml delete mode 100644 .forgejo/setup-rust/action.yaml create mode 100644 tools/ci-image/Dockerfile create mode 100755 tools/ci-image/build diff --git a/.forgejo/run-examples/action.yaml b/.forgejo/run-examples/action.yaml deleted file mode 100644 index 815e936..0000000 --- a/.forgejo/run-examples/action.yaml +++ /dev/null @@ -1,12 +0,0 @@ -# run all Cargo examples, as described here: -# -# Karol Kuczmarski. "Add examples to your Rust libraries" -# http://xion.io/post/code/rust-examples.html -# -runs: - using: "composite" - steps: - - run: cd app-proto; cargo run --example irisawa-hexlet - - run: cd app-proto; cargo run --example three-spheres - - run: cd app-proto; cargo run --example point-on-sphere - - run: cd app-proto; cargo run --example kaleidocycle \ No newline at end of file diff --git a/.forgejo/setup-rust/action.yaml b/.forgejo/setup-rust/action.yaml deleted file mode 100644 index 6960dc4..0000000 --- a/.forgejo/setup-rust/action.yaml +++ /dev/null @@ -1,10 +0,0 @@ -# set up the Rust toolchain. based on David Tolnay's more general -# `rust-toolchain` action for GitHub -# -# https://github.com/dtolnay/rust-toolchain -# -runs: - using: "composite" - steps: - - run: curl --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused --location --silent --show-error --fail 'https://sh.rustup.rs' | sh -s -- -y --profile minimal - - run: echo $HOME/.cargo/bin >> $GITHUB_PATH \ No newline at end of file diff --git a/.forgejo/workflows/continuous-integration.yaml b/.forgejo/workflows/continuous-integration.yaml index f821b1d..d200b53 100644 --- a/.forgejo/workflows/continuous-integration.yaml +++ b/.forgejo/workflows/continuous-integration.yaml @@ -3,23 +3,46 @@ on: push: branches: [main] jobs: + # build the application, reporting success if the build completes build: runs-on: docker + container: + image: dyna3:ci + defaults: + run: + working-directory: app-proto steps: - uses: https://code.forgejo.org/actions/checkout@v4 - - uses: ./.forgejo/setup-rust - - run: rustup target add wasm32-unknown-unknown - - run: cargo install trunk - - run: cd app-proto; trunk build + - run: trunk build + + # run the automated tests, reporting success if the tests pass test: runs-on: docker + container: + image: dyna3:ci + defaults: + run: + working-directory: app-proto steps: - uses: https://code.forgejo.org/actions/checkout@v4 - - uses: ./.forgejo/setup-rust - - run: cd app-proto; cargo test + - run: cargo test + + # run the Cargo examples, as described here: + # + # Karol Kuczmarski. "Add examples to your Rust libraries" + # http://xion.io/post/code/rust-examples.html + # + # report success if the examples build and run without errors run-examples: runs-on: docker + container: + image: dyna3:ci + defaults: + run: + working-directory: app-proto steps: - uses: https://code.forgejo.org/actions/checkout@v4 - - uses: ./.forgejo/setup-rust - - uses: ./.forgejo/run-examples \ No newline at end of file + - run: cargo run --example irisawa-hexlet + - run: cargo run --example three-spheres + - run: cargo run --example point-on-sphere + - run: cargo run --example kaleidocycle \ No newline at end of file diff --git a/tools/ci-image/Dockerfile b/tools/ci-image/Dockerfile new file mode 100644 index 0000000..de4668e --- /dev/null +++ b/tools/ci-image/Dockerfile @@ -0,0 +1,4 @@ +FROM rust:1.85-slim-bookworm +RUN rustup target add wasm32-unknown-unknown +RUN cargo install trunk +WORKDIR /home \ No newline at end of file diff --git a/tools/ci-image/build b/tools/ci-image/build new file mode 100755 index 0000000..d1a90dc --- /dev/null +++ b/tools/ci-image/build @@ -0,0 +1,5 @@ +#!/bin/sh + +# build and tag the Docker image we use for continuous integration + +docker build . --tag dyna3:ci \ No newline at end of file -- 2.43.0 From 71f4cd184c28d5b31010ed47bf13c979900aeda2 Mon Sep 17 00:00:00 2001 From: Aaron Fenyes Date: Sat, 8 Mar 2025 11:11:01 -0800 Subject: [PATCH 04/23] Fail continuous integration on warnings --- .../workflows/continuous-integration.yaml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/.forgejo/workflows/continuous-integration.yaml b/.forgejo/workflows/continuous-integration.yaml index d200b53..762ee62 100644 --- a/.forgejo/workflows/continuous-integration.yaml +++ b/.forgejo/workflows/continuous-integration.yaml @@ -3,7 +3,7 @@ on: push: branches: [main] jobs: - # build the application, reporting success if the build completes + # build the application, reporting success if there are no errors or warnings build: runs-on: docker container: @@ -13,9 +13,10 @@ jobs: working-directory: app-proto steps: - uses: https://code.forgejo.org/actions/checkout@v4 - - run: trunk build + - run: RUSTFLAGS='-D warnings' trunk build - # run the automated tests, reporting success if the tests pass + # run the automated tests, reporting success if the tests pass and were built + # without warnings test: runs-on: docker container: @@ -25,14 +26,14 @@ jobs: working-directory: app-proto steps: - uses: https://code.forgejo.org/actions/checkout@v4 - - run: cargo test + - run: RUSTFLAGS='-D warnings' cargo test # run the Cargo examples, as described here: # # Karol Kuczmarski. "Add examples to your Rust libraries" # http://xion.io/post/code/rust-examples.html # - # report success if the examples build and run without errors + # report success if the examples build and run without errors or warnings run-examples: runs-on: docker container: @@ -42,7 +43,7 @@ jobs: working-directory: app-proto steps: - uses: https://code.forgejo.org/actions/checkout@v4 - - run: cargo run --example irisawa-hexlet - - run: cargo run --example three-spheres - - run: cargo run --example point-on-sphere - - run: cargo run --example kaleidocycle \ No newline at end of file + - run: RUSTFLAGS='-D warnings' cargo run --example irisawa-hexlet + - run: RUSTFLAGS='-D warnings' cargo run --example three-spheres + - run: RUSTFLAGS='-D warnings' cargo run --example point-on-sphere + - run: RUSTFLAGS='-D warnings' cargo run --example kaleidocycle \ No newline at end of file -- 2.43.0 From 5f45c9c7a455ba40084cd76c4b60d75fb1b9d765 Mon Sep 17 00:00:00 2001 From: Aaron Fenyes Date: Wed, 26 Mar 2025 01:14:58 -0700 Subject: [PATCH 05/23] Set up the CI image during the CI workflow --- .forgejo/workflows/continuous-integration.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.forgejo/workflows/continuous-integration.yaml b/.forgejo/workflows/continuous-integration.yaml index 762ee62..c6b1f55 100644 --- a/.forgejo/workflows/continuous-integration.yaml +++ b/.forgejo/workflows/continuous-integration.yaml @@ -3,11 +3,21 @@ on: push: branches: [main] jobs: + # build and tag the Docker image that the rest of the jobs will run on + setup-image: + runs-on: self-hosted + defaults: + run: + working-directory: tools/ci-image + steps: + - uses: https://code.forgejo.org/actions/checkout@v4 + - run: docker build . --tag dyna3:ci # build the application, reporting success if there are no errors or warnings build: runs-on: docker container: image: dyna3:ci + needs: [setup-image] defaults: run: working-directory: app-proto @@ -21,6 +31,7 @@ jobs: runs-on: docker container: image: dyna3:ci + needs: [setup-image] defaults: run: working-directory: app-proto @@ -38,6 +49,7 @@ jobs: runs-on: docker container: image: dyna3:ci + needs: [setup-image] defaults: run: working-directory: app-proto -- 2.43.0 From 15375dc93213c22d9b79fa728ba6f849f102eeba Mon Sep 17 00:00:00 2001 From: Aaron Fenyes Date: Wed, 26 Mar 2025 02:29:17 -0700 Subject: [PATCH 06/23] Remove the CI image setup script The CI workflow now builds and tags the CI image automatically, so we don't need the manual setup script anymore. --- tools/ci-image/build | 5 ----- 1 file changed, 5 deletions(-) delete mode 100755 tools/ci-image/build diff --git a/tools/ci-image/build b/tools/ci-image/build deleted file mode 100755 index d1a90dc..0000000 --- a/tools/ci-image/build +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -# build and tag the Docker image we use for continuous integration - -docker build . --tag dyna3:ci \ No newline at end of file -- 2.43.0 From f212cfadf4c207a640db0217af2cd6f633f4c548 Mon Sep 17 00:00:00 2001 From: Aaron Fenyes Date: Thu, 27 Mar 2025 18:28:17 -0700 Subject: [PATCH 07/23] Tell Docker to build Trunk with only one job This might reduce the amount of memory it takes to build the CI image. --- tools/ci-image/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ci-image/Dockerfile b/tools/ci-image/Dockerfile index de4668e..4deb2d3 100644 --- a/tools/ci-image/Dockerfile +++ b/tools/ci-image/Dockerfile @@ -1,4 +1,4 @@ FROM rust:1.85-slim-bookworm RUN rustup target add wasm32-unknown-unknown -RUN cargo install trunk +RUN cargo install trunk --jobs 1 WORKDIR /home \ No newline at end of file -- 2.43.0 From 425124295342638e58ecc8c44cf67660ff96685b Mon Sep 17 00:00:00 2001 From: Aaron Fenyes Date: Thu, 27 Mar 2025 20:46:02 -0700 Subject: [PATCH 08/23] Run CI on a stock image, installing Trunk by hand Instead of building a custom CI image with Trunk pre-installed, let's try running CI on a stock image, installing Trunk from a binary on every workflow run. --- .forgejo/setup-trunk/action.yaml | 14 ++++++++++++++ .../workflows/continuous-integration.yaml | 19 ++++--------------- tools/ci-image/Dockerfile | 4 ---- 3 files changed, 18 insertions(+), 19 deletions(-) create mode 100644 .forgejo/setup-trunk/action.yaml delete mode 100644 tools/ci-image/Dockerfile diff --git a/.forgejo/setup-trunk/action.yaml b/.forgejo/setup-trunk/action.yaml new file mode 100644 index 0000000..180f237 --- /dev/null +++ b/.forgejo/setup-trunk/action.yaml @@ -0,0 +1,14 @@ +# set up the Trunk web build system +# +# https://trunkrs.dev +# +# the `curl` call is based on David Tolnay's `rust-toolchain` action +# +# https://github.com/dtolnay/rust-toolchain +# +runs: + using: "composite" + steps: + - run: rustup target add wasm32-unknown-unknown + - run: curl --output - --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused --location --silent --show-error --fail 'https://github.com/trunk-rs/trunk/releases/download/v0.21.12/trunk-x86_64-unknown-linux-gnu.tar.gz' | tar --gunzip --extract --file - + working-directory: /usr/local/cargo/bin \ No newline at end of file diff --git a/.forgejo/workflows/continuous-integration.yaml b/.forgejo/workflows/continuous-integration.yaml index c6b1f55..afe5d36 100644 --- a/.forgejo/workflows/continuous-integration.yaml +++ b/.forgejo/workflows/continuous-integration.yaml @@ -3,26 +3,17 @@ on: push: branches: [main] jobs: - # build and tag the Docker image that the rest of the jobs will run on - setup-image: - runs-on: self-hosted - defaults: - run: - working-directory: tools/ci-image - steps: - - uses: https://code.forgejo.org/actions/checkout@v4 - - run: docker build . --tag dyna3:ci # build the application, reporting success if there are no errors or warnings build: runs-on: docker container: - image: dyna3:ci - needs: [setup-image] + image: rust:1.85-bookworm defaults: run: working-directory: app-proto steps: - uses: https://code.forgejo.org/actions/checkout@v4 + - uses: ./.forgejo/setup-trunk - run: RUSTFLAGS='-D warnings' trunk build # run the automated tests, reporting success if the tests pass and were built @@ -30,8 +21,7 @@ jobs: test: runs-on: docker container: - image: dyna3:ci - needs: [setup-image] + image: rust:1.85-bookworm defaults: run: working-directory: app-proto @@ -48,8 +38,7 @@ jobs: run-examples: runs-on: docker container: - image: dyna3:ci - needs: [setup-image] + image: rust:1.85-bookworm defaults: run: working-directory: app-proto diff --git a/tools/ci-image/Dockerfile b/tools/ci-image/Dockerfile deleted file mode 100644 index 4deb2d3..0000000 --- a/tools/ci-image/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM rust:1.85-slim-bookworm -RUN rustup target add wasm32-unknown-unknown -RUN cargo install trunk --jobs 1 -WORKDIR /home \ No newline at end of file -- 2.43.0 From 7f45e98b46d74b6030cd38e2943938d8fb78f810 Mon Sep 17 00:00:00 2001 From: Aaron Fenyes Date: Thu, 27 Mar 2025 22:19:54 -0700 Subject: [PATCH 09/23] Switch to CircleCI's Rust + Node container image This should make the `checkout` work on the runner host. --- .forgejo/setup-trunk/action.yaml | 2 +- .forgejo/workflows/continuous-integration.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.forgejo/setup-trunk/action.yaml b/.forgejo/setup-trunk/action.yaml index 180f237..c0815e2 100644 --- a/.forgejo/setup-trunk/action.yaml +++ b/.forgejo/setup-trunk/action.yaml @@ -11,4 +11,4 @@ runs: steps: - run: rustup target add wasm32-unknown-unknown - run: curl --output - --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused --location --silent --show-error --fail 'https://github.com/trunk-rs/trunk/releases/download/v0.21.12/trunk-x86_64-unknown-linux-gnu.tar.gz' | tar --gunzip --extract --file - - working-directory: /usr/local/cargo/bin \ No newline at end of file + working-directory: /home/circleci/.cargo/bin \ No newline at end of file diff --git a/.forgejo/workflows/continuous-integration.yaml b/.forgejo/workflows/continuous-integration.yaml index afe5d36..041ed09 100644 --- a/.forgejo/workflows/continuous-integration.yaml +++ b/.forgejo/workflows/continuous-integration.yaml @@ -7,7 +7,7 @@ jobs: build: runs-on: docker container: - image: rust:1.85-bookworm + image: cimg/rust:1.85-node defaults: run: working-directory: app-proto @@ -21,7 +21,7 @@ jobs: test: runs-on: docker container: - image: rust:1.85-bookworm + image: cimg/rust:1.85-node defaults: run: working-directory: app-proto @@ -38,7 +38,7 @@ jobs: run-examples: runs-on: docker container: - image: rust:1.85-bookworm + image: cimg/rust:1.85-node defaults: run: working-directory: app-proto -- 2.43.0 From 0a9d2345574c84964388f31352fd113205ee0b9a Mon Sep 17 00:00:00 2001 From: Aaron Fenyes Date: Fri, 28 Mar 2025 00:36:38 -0700 Subject: [PATCH 10/23] Run the examples as tests --- .../workflows/continuous-integration.yaml | 25 +++---------------- app-proto/Cargo.toml | 20 +++++++++++++++ 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/.forgejo/workflows/continuous-integration.yaml b/.forgejo/workflows/continuous-integration.yaml index 041ed09..17bc49c 100644 --- a/.forgejo/workflows/continuous-integration.yaml +++ b/.forgejo/workflows/continuous-integration.yaml @@ -17,7 +17,8 @@ jobs: - run: RUSTFLAGS='-D warnings' trunk build # run the automated tests, reporting success if the tests pass and were built - # without warnings + # without warnings. the examples are run as tests, because we've configured + # each example target with `test = true` and `harness = false` in Cargo.toml test: runs-on: docker container: @@ -27,24 +28,4 @@ jobs: working-directory: app-proto steps: - uses: https://code.forgejo.org/actions/checkout@v4 - - run: RUSTFLAGS='-D warnings' cargo test - - # run the Cargo examples, as described here: - # - # Karol Kuczmarski. "Add examples to your Rust libraries" - # http://xion.io/post/code/rust-examples.html - # - # report success if the examples build and run without errors or warnings - run-examples: - runs-on: docker - container: - image: cimg/rust:1.85-node - defaults: - run: - working-directory: app-proto - steps: - - uses: https://code.forgejo.org/actions/checkout@v4 - - run: RUSTFLAGS='-D warnings' cargo run --example irisawa-hexlet - - run: RUSTFLAGS='-D warnings' cargo run --example three-spheres - - run: RUSTFLAGS='-D warnings' cargo run --example point-on-sphere - - run: RUSTFLAGS='-D warnings' cargo run --example kaleidocycle \ No newline at end of file + - run: RUSTFLAGS='-D warnings' cargo test \ No newline at end of file diff --git a/app-proto/Cargo.toml b/app-proto/Cargo.toml index 8000327..5ab7299 100644 --- a/app-proto/Cargo.toml +++ b/app-proto/Cargo.toml @@ -50,3 +50,23 @@ wasm-bindgen-test = "0.3.34" [profile.release] opt-level = "s" # optimize for small code size debug = true # include debug symbols + +[[example]] +name = "irisawa-hexlet" +test = true +harness = false + +[[example]] +name = "kaleidocycle" +test = true +harness = false + +[[example]] +name = "point-on-sphere" +test = true +harness = false + +[[example]] +name = "three-spheres" +test = true +harness = false -- 2.43.0 From 992fb76419767a784233cff22036e06a174c3f30 Mon Sep 17 00:00:00 2001 From: Aaron Fenyes Date: Fri, 28 Mar 2025 12:30:02 -0700 Subject: [PATCH 11/23] Do the Trunk build check as an end-to-end test This consolidates our whole CI workflow into `cargo test`. --- .forgejo/workflows/continuous-integration.yaml | 18 ++++-------------- app-proto/src/main.rs | 3 +++ app-proto/src/tests.rs | 14 ++++++++++++++ 3 files changed, 21 insertions(+), 14 deletions(-) create mode 100644 app-proto/src/tests.rs diff --git a/.forgejo/workflows/continuous-integration.yaml b/.forgejo/workflows/continuous-integration.yaml index 17bc49c..58b2398 100644 --- a/.forgejo/workflows/continuous-integration.yaml +++ b/.forgejo/workflows/continuous-integration.yaml @@ -3,22 +3,11 @@ on: push: branches: [main] jobs: - # build the application, reporting success if there are no errors or warnings - build: - runs-on: docker - container: - image: cimg/rust:1.85-node - defaults: - run: - working-directory: app-proto - steps: - - uses: https://code.forgejo.org/actions/checkout@v4 - - uses: ./.forgejo/setup-trunk - - run: RUSTFLAGS='-D warnings' trunk build - # run the automated tests, reporting success if the tests pass and were built # without warnings. the examples are run as tests, because we've configured - # each example target with `test = true` and `harness = false` in Cargo.toml + # each example target with `test = true` and `harness = false` in Cargo.toml. + # Trunk build failures caused by problems outside the Rust source code, like + # missing assets, should be caught by `trunk_build_test` test: runs-on: docker container: @@ -28,4 +17,5 @@ jobs: working-directory: app-proto steps: - uses: https://code.forgejo.org/actions/checkout@v4 + - uses: ./.forgejo/setup-trunk - run: RUSTFLAGS='-D warnings' cargo test \ No newline at end of file diff --git a/app-proto/src/main.rs b/app-proto/src/main.rs index 6ab3e49..e581997 100644 --- a/app-proto/src/main.rs +++ b/app-proto/src/main.rs @@ -5,6 +5,9 @@ mod engine; mod outline; mod specified; +#[cfg(test)] +mod tests; + use rustc_hash::FxHashSet; use sycamore::prelude::*; diff --git a/app-proto/src/tests.rs b/app-proto/src/tests.rs new file mode 100644 index 0000000..2c5436b --- /dev/null +++ b/app-proto/src/tests.rs @@ -0,0 +1,14 @@ +use std::process::Command; + +// build and bundle the application, reporting success if there are no errors or +// warnings. to see this test fail while others succeed, try moving `index.html` +// or one of the assets that it links to +#[test] +fn trunk_build_test() { + let build_status = Command::new("trunk") + .arg("build") + .env("RUSTFLAGS", "-D warnings") + .status() + .expect("Call to Trunk failed"); + assert!(build_status.success()); +} \ No newline at end of file -- 2.43.0 From df2d45816cbe9402786c44c46ecc4c11a6a49621 Mon Sep 17 00:00:00 2001 From: Aaron Fenyes Date: Sun, 30 Mar 2025 13:05:20 -0700 Subject: [PATCH 12/23] Find the home directory instead of hard-coding it This should make the `setup-trunk` workflow more container-independent. --- .forgejo/setup-trunk/action.yaml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.forgejo/setup-trunk/action.yaml b/.forgejo/setup-trunk/action.yaml index c0815e2..1bfb1db 100644 --- a/.forgejo/setup-trunk/action.yaml +++ b/.forgejo/setup-trunk/action.yaml @@ -10,5 +10,13 @@ runs: using: "composite" steps: - run: rustup target add wasm32-unknown-unknown + # Forgejo Runner seems to modify the HOME variable when it's running a job + # in a Docker container, so we have to find the home directory another way, + # inspired by this StackOverflow answer: + # + # https://unix.stackexchange.com/a/247582 + # + - id: find-home + run: eval echo "home=~$(whoami)" >> $GITHUB_OUTPUT - run: curl --output - --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused --location --silent --show-error --fail 'https://github.com/trunk-rs/trunk/releases/download/v0.21.12/trunk-x86_64-unknown-linux-gnu.tar.gz' | tar --gunzip --extract --file - - working-directory: /home/circleci/.cargo/bin \ No newline at end of file + working-directory: ${{ steps.find-home.outputs.home }}/.cargo/bin \ No newline at end of file -- 2.43.0 From 4bb0b0563592792dae42524d0a82dbdf0f600b98 Mon Sep 17 00:00:00 2001 From: Glen Whitney Date: Tue, 1 Apr 2025 19:01:21 -0700 Subject: [PATCH 13/23] test: move `trunk` installation for CI to ci-bin/ --- .forgejo/setup-trunk/action.yaml | 13 ++++--------- .gitignore | 8 +------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/.forgejo/setup-trunk/action.yaml b/.forgejo/setup-trunk/action.yaml index 1bfb1db..dee45ff 100644 --- a/.forgejo/setup-trunk/action.yaml +++ b/.forgejo/setup-trunk/action.yaml @@ -10,13 +10,8 @@ runs: using: "composite" steps: - run: rustup target add wasm32-unknown-unknown - # Forgejo Runner seems to modify the HOME variable when it's running a job - # in a Docker container, so we have to find the home directory another way, - # inspired by this StackOverflow answer: - # - # https://unix.stackexchange.com/a/247582 - # - - id: find-home - run: eval echo "home=~$(whoami)" >> $GITHUB_OUTPUT + # Assume we remain in the top-level directory of the checkout: + - run: mkdir -p ci-bin - run: curl --output - --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused --location --silent --show-error --fail 'https://github.com/trunk-rs/trunk/releases/download/v0.21.12/trunk-x86_64-unknown-linux-gnu.tar.gz' | tar --gunzip --extract --file - - working-directory: ${{ steps.find-home.outputs.home }}/.cargo/bin \ No newline at end of file + working-directory: ci-bin + - run: export PATH="$(pwd)/ci-bin:$PATH" diff --git a/.gitignore b/.gitignore index 3e95fba..ba2944f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,2 @@ -node_modules -site -docbuild -__tests__ -coverage -dyna3.zip -tmpproj +ci-bin *~ -- 2.43.0 From 81035270b819fc0394447098cf3ee227f3ee852d Mon Sep 17 00:00:00 2001 From: Glen Whitney Date: Tue, 1 Apr 2025 19:09:24 -0700 Subject: [PATCH 14/23] test: check path after setup-trunk --- .forgejo/workflows/continuous-integration.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.forgejo/workflows/continuous-integration.yaml b/.forgejo/workflows/continuous-integration.yaml index 58b2398..402c9bb 100644 --- a/.forgejo/workflows/continuous-integration.yaml +++ b/.forgejo/workflows/continuous-integration.yaml @@ -18,4 +18,5 @@ jobs: steps: - uses: https://code.forgejo.org/actions/checkout@v4 - uses: ./.forgejo/setup-trunk + - run: echo "$PATH" - run: RUSTFLAGS='-D warnings' cargo test \ No newline at end of file -- 2.43.0 From 80a4acd56af208069d91dccf489b40f52cf15a37 Mon Sep 17 00:00:00 2001 From: Glen Whitney Date: Tue, 1 Apr 2025 19:23:39 -0700 Subject: [PATCH 15/23] test: check path at end of setup-trunk --- .forgejo/setup-trunk/action.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.forgejo/setup-trunk/action.yaml b/.forgejo/setup-trunk/action.yaml index dee45ff..1baa6ce 100644 --- a/.forgejo/setup-trunk/action.yaml +++ b/.forgejo/setup-trunk/action.yaml @@ -15,3 +15,4 @@ runs: - run: curl --output - --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused --location --silent --show-error --fail 'https://github.com/trunk-rs/trunk/releases/download/v0.21.12/trunk-x86_64-unknown-linux-gnu.tar.gz' | tar --gunzip --extract --file - working-directory: ci-bin - run: export PATH="$(pwd)/ci-bin:$PATH" + - run: echo "$PATH" -- 2.43.0 From 5e441d6b1187fd4acbb54d3d24bb7e8d4facf68f Mon Sep 17 00:00:00 2001 From: Glen Whitney Date: Tue, 1 Apr 2025 19:43:53 -0700 Subject: [PATCH 16/23] test: try $GITHUB_PATH for updating PATH --- .forgejo/setup-trunk/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/setup-trunk/action.yaml b/.forgejo/setup-trunk/action.yaml index 1baa6ce..0e65730 100644 --- a/.forgejo/setup-trunk/action.yaml +++ b/.forgejo/setup-trunk/action.yaml @@ -14,5 +14,5 @@ runs: - run: mkdir -p ci-bin - run: curl --output - --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused --location --silent --show-error --fail 'https://github.com/trunk-rs/trunk/releases/download/v0.21.12/trunk-x86_64-unknown-linux-gnu.tar.gz' | tar --gunzip --extract --file - working-directory: ci-bin - - run: export PATH="$(pwd)/ci-bin:$PATH" + - run: echo "$(pwd)/ci-bin" >> $GITHUB_PATH - run: echo "$PATH" -- 2.43.0 From 0e38a38b5780e3e9368bb1f1a41467dabf66494b Mon Sep 17 00:00:00 2001 From: Glen Whitney Date: Tue, 1 Apr 2025 19:51:07 -0700 Subject: [PATCH 17/23] chore: remove now-useless /home/glen/.venv/bin:/home/glen/.elan/bin:/home/glen/.local/share/pnpm:/home/glen/.local/bin:/home/glen/bin:/usr/local/bin:/usr/bin:/bin:/snap/bin checks --- .forgejo/setup-trunk/action.yaml | 1 - .forgejo/workflows/continuous-integration.yaml | 1 - 2 files changed, 2 deletions(-) diff --git a/.forgejo/setup-trunk/action.yaml b/.forgejo/setup-trunk/action.yaml index 0e65730..5be3c79 100644 --- a/.forgejo/setup-trunk/action.yaml +++ b/.forgejo/setup-trunk/action.yaml @@ -15,4 +15,3 @@ runs: - run: curl --output - --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused --location --silent --show-error --fail 'https://github.com/trunk-rs/trunk/releases/download/v0.21.12/trunk-x86_64-unknown-linux-gnu.tar.gz' | tar --gunzip --extract --file - working-directory: ci-bin - run: echo "$(pwd)/ci-bin" >> $GITHUB_PATH - - run: echo "$PATH" diff --git a/.forgejo/workflows/continuous-integration.yaml b/.forgejo/workflows/continuous-integration.yaml index 402c9bb..58b2398 100644 --- a/.forgejo/workflows/continuous-integration.yaml +++ b/.forgejo/workflows/continuous-integration.yaml @@ -18,5 +18,4 @@ jobs: steps: - uses: https://code.forgejo.org/actions/checkout@v4 - uses: ./.forgejo/setup-trunk - - run: echo "$PATH" - run: RUSTFLAGS='-D warnings' cargo test \ No newline at end of file -- 2.43.0 From efb2d39042b7c0b7a9bfcd8ccc599566d64f5f81 Mon Sep 17 00:00:00 2001 From: Aaron Fenyes Date: Wed, 2 Apr 2025 12:06:01 -0700 Subject: [PATCH 18/23] Clarify where stuff happens in the CI workflow --- .forgejo/workflows/continuous-integration.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.forgejo/workflows/continuous-integration.yaml b/.forgejo/workflows/continuous-integration.yaml index 58b2398..d39b400 100644 --- a/.forgejo/workflows/continuous-integration.yaml +++ b/.forgejo/workflows/continuous-integration.yaml @@ -14,8 +14,18 @@ jobs: image: cimg/rust:1.85-node defaults: run: + # set the default working directory for each `run` step, relative to the + # workspace directory. this default only affects `run` steps (and if we + # tried to set the `working-directory` label for any other kind of step, + # it wouldn't be recognized anyway) working-directory: app-proto steps: + # check out the repository to the workspace directory. in the action + # description, you can get and set the workspace directory through the + # `github.workspace` and `env.GITHUB_WORKSPACE` labels, which always have + # the same value. in the container, you can get the workspace directory + # from the `GITHUB_WORKSPACE` environment variable - uses: https://code.forgejo.org/actions/checkout@v4 + - uses: ./.forgejo/setup-trunk - run: RUSTFLAGS='-D warnings' cargo test \ No newline at end of file -- 2.43.0 From 440b1dfb3d3a60c6f5b65b0fc9b159c09bf82e3e Mon Sep 17 00:00:00 2001 From: Aaron Fenyes Date: Wed, 2 Apr 2025 12:30:55 -0700 Subject: [PATCH 19/23] Clarify where `setup-trunk` puts the Trunk binary --- .forgejo/setup-trunk/action.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.forgejo/setup-trunk/action.yaml b/.forgejo/setup-trunk/action.yaml index 5be3c79..6007527 100644 --- a/.forgejo/setup-trunk/action.yaml +++ b/.forgejo/setup-trunk/action.yaml @@ -10,8 +10,13 @@ runs: using: "composite" steps: - run: rustup target add wasm32-unknown-unknown - # Assume we remain in the top-level directory of the checkout: + + # install the Trunk binary to `ci-bin` within the workspace directory, which + # is determined by the `github.workspace` label and reflected in the + # `GITHUB_WORKSPACE` environment variable. then, make the `trunk` command + # available by placing the fully qualified path to `ci-bin` on the + # workflow's search path - run: mkdir -p ci-bin - run: curl --output - --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused --location --silent --show-error --fail 'https://github.com/trunk-rs/trunk/releases/download/v0.21.12/trunk-x86_64-unknown-linux-gnu.tar.gz' | tar --gunzip --extract --file - working-directory: ci-bin - - run: echo "$(pwd)/ci-bin" >> $GITHUB_PATH + - run: echo "${{ github.workspace }}/ci-bin" >> $GITHUB_PATH -- 2.43.0 From 3f4fe582b3171478a74aa99012f929612c17c6d2 Mon Sep 17 00:00:00 2001 From: Aaron Fenyes Date: Wed, 2 Apr 2025 12:40:30 -0700 Subject: [PATCH 20/23] Fail CI to confirm that merging is blocked --- app-proto/src/main.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/app-proto/src/main.rs b/app-proto/src/main.rs index e581997..29716a0 100644 --- a/app-proto/src/main.rs +++ b/app-proto/src/main.rs @@ -1,3 +1,4 @@ +compile_error!("does not compute"); mod add_remove; mod assembly; mod display; -- 2.43.0 From 17fc7265a2f5656a1696c93d0d8b4178dff2c9e7 Mon Sep 17 00:00:00 2001 From: Glen Whitney Date: Wed, 2 Apr 2025 13:01:20 -0700 Subject: [PATCH 21/23] test: revert intentional failure; examine directories --- .forgejo/workflows/continuous-integration.yaml | 2 ++ app-proto/src/main.rs | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/continuous-integration.yaml b/.forgejo/workflows/continuous-integration.yaml index d39b400..e16f2f5 100644 --- a/.forgejo/workflows/continuous-integration.yaml +++ b/.forgejo/workflows/continuous-integration.yaml @@ -28,4 +28,6 @@ jobs: - uses: https://code.forgejo.org/actions/checkout@v4 - uses: ./.forgejo/setup-trunk + - run: pwd + - run: ls - run: RUSTFLAGS='-D warnings' cargo test \ No newline at end of file diff --git a/app-proto/src/main.rs b/app-proto/src/main.rs index 29716a0..e581997 100644 --- a/app-proto/src/main.rs +++ b/app-proto/src/main.rs @@ -1,4 +1,3 @@ -compile_error!("does not compute"); mod add_remove; mod assembly; mod display; -- 2.43.0 From d768a39c7a8f2bd052d3dabf3442fb2b9d19ff0f Mon Sep 17 00:00:00 2001 From: Glen Whitney Date: Wed, 2 Apr 2025 13:08:03 -0700 Subject: [PATCH 22/23] test: oops examine directories better --- .forgejo/workflows/continuous-integration.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/continuous-integration.yaml b/.forgejo/workflows/continuous-integration.yaml index e16f2f5..dc9bbc6 100644 --- a/.forgejo/workflows/continuous-integration.yaml +++ b/.forgejo/workflows/continuous-integration.yaml @@ -28,6 +28,6 @@ jobs: - uses: https://code.forgejo.org/actions/checkout@v4 - uses: ./.forgejo/setup-trunk - - run: pwd - - run: ls + - run: echo $GITHUB_WORKSPACE + - run: ls .. - run: RUSTFLAGS='-D warnings' cargo test \ No newline at end of file -- 2.43.0 From 30bdf05f78cadd66db9c4fc1018d2b471753617d Mon Sep 17 00:00:00 2001 From: Glen Whitney Date: Wed, 2 Apr 2025 13:20:34 -0700 Subject: [PATCH 23/23] doc: Clarify the destination of checkout, remove investigative steps --- .forgejo/workflows/continuous-integration.yaml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.forgejo/workflows/continuous-integration.yaml b/.forgejo/workflows/continuous-integration.yaml index dc9bbc6..daf8923 100644 --- a/.forgejo/workflows/continuous-integration.yaml +++ b/.forgejo/workflows/continuous-integration.yaml @@ -20,14 +20,10 @@ jobs: # it wouldn't be recognized anyway) working-directory: app-proto steps: - # check out the repository to the workspace directory. in the action - # description, you can get and set the workspace directory through the - # `github.workspace` and `env.GITHUB_WORKSPACE` labels, which always have - # the same value. in the container, you can get the workspace directory - # from the `GITHUB_WORKSPACE` environment variable + # Check out the repository so that its top-level directory is the + # workspace directory (action variable `github.workspace`, environment + # variable `$GITHUB_WORKSPACE`): - uses: https://code.forgejo.org/actions/checkout@v4 - uses: ./.forgejo/setup-trunk - - run: echo $GITHUB_WORKSPACE - - run: ls .. - run: RUSTFLAGS='-D warnings' cargo test \ No newline at end of file -- 2.43.0