From 49c64107e8ea0edd271b7503bf55af9e4550b821 Mon Sep 17 00:00:00 2001 From: Dan Chiarlone Date: Mon, 17 Oct 2022 09:05:21 -0700 Subject: [PATCH] added support for macos-latest aarch64 (#219) * added macos release Signed-off-by: danbugs * added M1 binary Signed-off-by: danbugs * added new rustup target Signed-off-by: danbugs * updated openssl var name Signed-off-by: danbugs * brought back old openssl var together with new one Signed-off-by: danbugs * vendoring openssl Signed-off-by: danbugs * windows dynamically links openssl Signed-off-by: danbugs * corrected path for slight release Signed-off-by: danbugs * quick undo Signed-off-by: danbugs * addressing PR comments Signed-off-by: danbugs Signed-off-by: danbugs --- .devcontainer/setup.sh | 2 +- .github/workflows/ci.yaml | 34 +- .github/workflows/release.yml | 63 +++- Cargo.lock | 457 ++++++++++++++++----------- Cargo.toml | 1 + Makefile | 10 +- build/azure-pipeline/workflow-pr.yml | 8 - crates/pubsub/Cargo.toml | 2 +- install.ps1 | 2 +- install.sh | 21 +- 10 files changed, 377 insertions(+), 223 deletions(-) diff --git a/.devcontainer/setup.sh b/.devcontainer/setup.sh index cd87406a..4aec4ab0 100755 --- a/.devcontainer/setup.sh +++ b/.devcontainer/setup.sh @@ -12,7 +12,7 @@ apt-get install -y \ build-essential \ cmake \ libssl-dev \ - openssl \ + openssl \ unzip ## update and install 2nd level of packages diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f6ecadb3..76667a0e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -19,14 +19,18 @@ jobs: matrix: config: - os: "ubuntu-latest" - extension: "" platformAgnosticChecks: true - - os: "macos-latest" - extension: "" - extraArgs: "" + - { + os: "macos-latest", + arch: "amd64" + } + - { + os: macos-latest, + arch: aarch64, + extraArgs: "--target aarch64-apple-darwin" + } - os: "windows-latest" extension: ".exe" - extraArgs: "" steps: # @@ -51,9 +55,11 @@ jobs: - name: "Install Dependencies on Linux" run: make install-deps if: ${{ fromJSON(matrix.config.os == 'ubuntu-latest') }} + - name: "Install Dependencies on MacOS" run: make install-deps-macos if: ${{ fromJSON(matrix.config.os == 'macos-latest') }} + - name: "Install Dependencies on Windows" run: | choco install wget @@ -62,7 +68,6 @@ jobs: mkdir -p /opt/wasi-sdk mv wasi-sdk-15.0/* /opt/wasi-sdk/ make install-deps-win - ls /opt/wasi-sdk/bin/ if: ${{ fromJSON(matrix.config.os == 'windows-latest') }} @@ -71,6 +76,7 @@ jobs: run: | rustup target add wasm32-wasi rustup target add wasm32-unknown-unknown + rustup target add aarch64-apple-darwin - name: "Install wit-bindgen-cli" run: cargo install --git https://github.com/bytecodealliance/wit-bindgen wit-bindgen-cli --tag v0.2.0 @@ -88,16 +94,21 @@ jobs: - name: "Build SpiderLightning and Slight" run: make build - if: ${{ fromJSON(matrix.config.os == 'macos-latest') }} - env: - OPENSSL_ROOT_DIR: /usr/local/opt/openssl + if: ${{ fromJSON(matrix.config.os == 'macos-latest') && + fromJSON(matrix.config.arch == 'amd64') }} + + - name: "Build SpiderLightning and Slight" + run: cargo build --manifest-path ./slight/Cargo.toml --release ${{ matrix.config.extraArgs }} + if: ${{ fromJSON(matrix.config.os == 'macos-latest') && + fromJSON(matrix.config.arch == 'aarch64') }} - name: "Build SpiderLightning and Slight" run: make build if: ${{ fromJSON(matrix.config.os == 'windows-latest') }} env: OPENSSL_DIR: C:\Program Files\OpenSSL-Win64\ - + OPENSSL_NO_VENDOR: true + - name: "Build Rust Examples" run: make build-rust @@ -123,11 +134,10 @@ jobs: - name: "Run Unit Tests" run: make test if: ${{ fromJSON(matrix.config.os == 'macos-latest') }} - env: - OPENSSL_ROOT_DIR: /usr/local/opt/openssl - name: "Run Unit Tests" run: make test if: ${{ fromJSON(matrix.config.os == 'windows-latest') }} env: OPENSSL_DIR: C:\Program Files\OpenSSL-Win64\ + OPENSSL_NO_VENDOR: true \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 79a33f10..64e60aff 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,6 +27,15 @@ jobs: config: - os: ubuntu-latest - os: windows-latest + - { + os: macos-latest, + arch: amd64 + } + - { + os: macos-latest, + arch: aarch64, + extraArgs: "--target aarch64-apple-darwin" + } steps: - uses: actions/checkout@v1 @@ -35,10 +44,11 @@ jobs: - name: "add rustup wasm targets" run: | rustup target add wasm32-wasi - rustup target add wasm32-unknown-unknown - + rustup target add wasm32-unknown-unknown + rustup target add aarch64-apple-darwin + - run : choco install openssl - if: ${{ fromJSON(matrix.config.os == 'windows-latest') }} + if: ${{ fromJSON(matrix.config.os == 'windows-latest') }} - name: "build for unix" run: make build @@ -49,6 +59,17 @@ jobs: if: ${{ fromJSON(matrix.config.os == 'windows-latest') }} env: OPENSSL_DIR: C:\Program Files\OpenSSL-Win64\ + OPENSSL_NO_VENDOR: true + + - name: "build for macos amd64" + run: make build + if: ${{ fromJSON(matrix.config.os == 'macos-latest') && + fromJSON(matrix.config.arch == 'amd64') }} + + - name: "build for macos aarch64" + run: cargo build --manifest-path ./slight/Cargo.toml --release ${{ matrix.config.extraArgs }} + if: ${{ fromJSON(matrix.config.os == 'macos-latest') && + fromJSON(matrix.config.arch == 'aarch64') }} - run: make prepare-release if: ${{ fromJSON(matrix.config.os == 'ubuntu-latest') }} @@ -56,19 +77,43 @@ jobs: - run: make prepare-release-win if: ${{ fromJSON(matrix.config.os == 'windows-latest') }} - - name: "add wits, and slight-unix and templates tars to release" + - run: make prepare-release-mac + if: ${{ fromJSON(matrix.config.os == 'macos-latest') && + fromJSON(matrix.config.arch == 'amd64') }} + + - name: "tar release for macos-aarch64" + run: tar -C target/ -czvf slight-macos-aarch64.tar.gz aarch64-apple-darwin/release/slight + if: ${{ fromJSON(matrix.config.os == 'macos-latest') && + fromJSON(matrix.config.arch == 'aarch64') }} + + - name: "add wits, and slight-linux-x86_64 and templates tars to release" uses: softprops/action-gh-release@v1 with: files: | - slight-unix.tar.gz + slight-linux-x86_64.tar.gz *-template.tar.gz wit/*.wit if: ${{ fromJSON(matrix.config.os == 'ubuntu-latest') }} - - name: "add slight-win tar to release" + - name: "add slight-windows tar to release" + uses: softprops/action-gh-release@v1 + with: + files: | + slight-windows-x86_64.tar.gz + if: ${{ fromJSON(matrix.config.os == 'windows-latest') }} + + - name: "add slight-macos-amd64 tar to release" + uses: softprops/action-gh-release@v1 + with: + files: | + slight-macos-amd64.tar.gz + if: ${{ fromJSON(matrix.config.os == 'macos-latest') && + fromJSON(matrix.config.arch == 'amd64') }} + + - name: "add slight-macos-aarch64 tar to release" uses: softprops/action-gh-release@v1 with: files: | - slight-win.tar.gz - if: ${{ fromJSON(matrix.config.os == 'windows-latest') }} - \ No newline at end of file + slight-macos-aarch64.tar.gz + if: ${{ fromJSON(matrix.config.os == 'macos-latest') && + fromJSON(matrix.config.arch == 'aarch64') }} \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index 4275f466..8a51a00a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -112,20 +112,11 @@ dependencies = [ "libc", ] -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - [[package]] name = "anyhow" -version = "1.0.64" +version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9a8f622bcf6ff3df478e9deba3e03e4e04b300f8e6a139e192c05fa3490afc7" +checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602" [[package]] name = "as-any" @@ -441,7 +432,7 @@ dependencies = [ "percent-encoding", "regex", "ring", - "time 0.3.14", + "time 0.3.15", "tracing", ] @@ -544,7 +535,7 @@ dependencies = [ "itoa", "num-integer", "ryu", - "time 0.3.14", + "time 0.3.15", ] [[package]] @@ -574,9 +565,9 @@ dependencies = [ [[package]] name = "axum" -version = "0.5.15" +version = "0.5.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de18bc5f2e9df8f52da03856bf40e29b747de5a84e43aefff90e3dc4a21529b" +checksum = "c9e3356844c4d6a6d6467b8da2cffb4a2820be256f50a3a386c9d152bab31043" dependencies = [ "async-trait", "axum-core", @@ -603,9 +594,9 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4f44a0e6200e9d11a1cdc989e4b358f6e3d354fbf48478f345a17f4e43f8635" +checksum = "d9f0c0a60006f2a293d82d571f635042a72edf927539b7685bd62d361963839b" dependencies = [ "async-trait", "bytes 1.2.1", @@ -613,6 +604,8 @@ dependencies = [ "http", "http-body", "mime", + "tower-layer", + "tower-service", ] [[package]] @@ -629,7 +622,7 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "sha2 0.10.5", + "sha2 0.10.6", "surf", "url", ] @@ -658,7 +651,7 @@ dependencies = [ "serde_json", "thiserror", "url", - "uuid 1.1.2", + "uuid 1.2.1", ] [[package]] @@ -682,9 +675,9 @@ dependencies = [ "rustc_version 0.4.0", "serde", "serde_json", - "time 0.3.14", + "time 0.3.15", "url", - "uuid 1.1.2", + "uuid 1.2.1", ] [[package]] @@ -700,7 +693,7 @@ dependencies = [ "http", "log", "ring", - "sha2 0.10.5", + "sha2 0.10.6", "url", ] @@ -723,10 +716,10 @@ dependencies = [ "serde-xml-rs", "serde_derive", "serde_json", - "sha2 0.10.5", - "time 0.3.14", + "sha2 0.10.6", + "time 0.3.15", "url", - "uuid 1.1.2", + "uuid 1.2.1", ] [[package]] @@ -747,9 +740,9 @@ dependencies = [ "serde-xml-rs", "serde_derive", "serde_json", - "time 0.3.14", + "time 0.3.15", "url", - "uuid 1.1.2", + "uuid 1.2.1", ] [[package]] @@ -889,9 +882,9 @@ checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" [[package]] name = "cap-fs-ext" -version = "0.25.2" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04e142bbbe9d5d6a2dd0387f887a000b41f4c82fb1226316dfb4cc8dbc3b1a29" +checksum = "438ca7f5bb15c799ea146429e4f8b7bfd25ff1eb05319024549a7728de45800c" dependencies = [ "cap-primitives", "cap-std", @@ -901,12 +894,11 @@ dependencies = [ [[package]] name = "cap-primitives" -version = "0.25.2" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f22f4975282dd4f2330ee004f001c4e22f420da9fb474ea600e9af330f1e548" +checksum = "ba063daa90ed40882bb288ac4ecaa942d655d15cf74393d41d2267b5d7daf120" dependencies = [ "ambient-authority", - "errno", "fs-set-times", "io-extras", "io-lifetimes", @@ -920,9 +912,9 @@ dependencies = [ [[package]] name = "cap-rand" -version = "0.25.2" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef643f8defef7061c395bb3721b6a80d39c1baaa8ee2e42edf2917fa05584e7f" +checksum = "c720808e249f0ae846ec647fe48cef3cea67e4e5026cf869c041c278b7dcae45" dependencies = [ "ambient-authority", "rand 0.8.5", @@ -930,9 +922,9 @@ dependencies = [ [[package]] name = "cap-std" -version = "0.25.2" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95624bb0abba6b6ff6fad2e02a7d3945d093d064ac5a3477a308c29fbe3bfd49" +checksum = "0e3a603c9f3bd2181ed128ab3cd32fbde7cff76afc64a3576662701c4aee7e2b" dependencies = [ "cap-primitives", "io-extras", @@ -943,9 +935,9 @@ dependencies = [ [[package]] name = "cap-time-ext" -version = "0.25.2" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46a2d284862edf6e431e9ad4e109c02855157904cebaceae6f042b124a1a21e2" +checksum = "da76e64f3e46f8c8479e392a7fe3faa2e76b8c1cea4618bae445276fdec12082" dependencies = [ "cap-primitives", "once_cell", @@ -995,9 +987,9 @@ dependencies = [ [[package]] name = "clap" -version = "3.2.20" +version = "3.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b71c3ce99b7611011217b366d923f1d0a7e07a92bb2dbf1e84508c673ca3bd" +checksum = "86447ad904c7fb335a790c9d7fe3d0d971dc523b8ccd1561a520de9a85302750" dependencies = [ "atty", "bitflags", @@ -1060,6 +1052,16 @@ dependencies = [ "cc", ] +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + [[package]] name = "combine" version = "4.6.6" @@ -1279,26 +1281,24 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.10" +version = "0.9.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "045ebe27666471bb549370b4b0b3e51b07f56325befa4284db65fc89c02511b1" +checksum = "f916dfc5d356b0ed9dae65f1db9fc9770aa2851d2662b988ccf4fe3516e86348" dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", "memoffset", - "once_cell", "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.11" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc" +checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac" dependencies = [ "cfg-if", - "once_cell", ] [[package]] @@ -1380,6 +1380,50 @@ dependencies = [ "winapi", ] +[[package]] +name = "cxx" +version = "1.0.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19f39818dcfc97d45b03953c1292efc4e80954e1583c4aa770bac1383e2310a4" +dependencies = [ + "cc", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", +] + +[[package]] +name = "cxx-build" +version = "1.0.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e580d70777c116df50c390d1211993f62d40302881e54d4b79727acb83d0199" +dependencies = [ + "cc", + "codespan-reporting", + "once_cell", + "proc-macro2", + "quote", + "scratch", + "syn", +] + +[[package]] +name = "cxxbridge-flags" +version = "1.0.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56a46460b88d1cec95112c8c363f0e2c39afdb237f60583b0b36343bf627ea9c" + +[[package]] +name = "cxxbridge-macro" +version = "1.0.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "747b608fecf06b0d72d440f27acc99288207324b793be2c17991839f3d4995ea" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "debug-helper" version = "0.3.13" @@ -1408,9 +1452,9 @@ dependencies = [ [[package]] name = "digest" -version = "0.10.3" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" +checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c" dependencies = [ "block-buffer 0.10.3", "crypto-common", @@ -1493,9 +1537,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3" +checksum = "c90bf5f19754d10198ccb95b70664fc925bd1fc090a0fd9a6ebc54acc8cd6272" dependencies = [ "atty", "humantime", @@ -1634,11 +1678,10 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" dependencies = [ - "matches", "percent-encoding", ] @@ -1947,7 +1990,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.3", + "digest 0.10.5", ] [[package]] @@ -2111,18 +2154,28 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.47" +version = "0.1.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c495f162af0bf17656d0014a0eded5f3cd2f365fdd204548c2869db89359dc7" +checksum = "f5a6ef98976b22b3b7f2f3a806f858cb862044cfa66805aa3ad84cb3d3b785ed" dependencies = [ "android_system_properties", "core-foundation-sys", + "iana-time-zone-haiku", "js-sys", - "once_cell", "wasm-bindgen", "winapi", ] +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fde6edd6cef363e9359ed3c98ba64590ba9eecba2293eb5a723ab32aee8926aa" +dependencies = [ + "cxx", + "cxx-build", +] + [[package]] name = "id-arena" version = "2.2.1" @@ -2131,11 +2184,10 @@ checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" [[package]] name = "idna" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" dependencies = [ - "matches", "unicode-bidi", "unicode-normalization", ] @@ -2249,18 +2301,18 @@ dependencies = [ [[package]] name = "itertools" -version = "0.10.3" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" +checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" [[package]] name = "ittapi-rs" @@ -2273,18 +2325,18 @@ dependencies = [ [[package]] name = "jobserver" -version = "0.1.24" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa" +checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.59" +version = "0.3.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2" +checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" dependencies = [ "wasm-bindgen", ] @@ -2332,9 +2384,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.132" +version = "0.2.135" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5" +checksum = "68783febc7782c6c5cb401fbda4de5a9898be1762314da0bb2c10ced61f18b0c" [[package]] name = "libmosquitto-sys" @@ -2369,6 +2421,15 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "link-cplusplus" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369" +dependencies = [ + "cc", +] + [[package]] name = "linux-raw-sys" version = "0.0.46" @@ -2377,9 +2438,9 @@ checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" [[package]] name = "lock_api" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f80bf5aacaf25cbfc8210d1cfb718f2bf3b11c4c54e5afe36c236853a8ec390" +checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" dependencies = [ "autocfg", "scopeguard", @@ -2419,12 +2480,6 @@ dependencies = [ "regex-automata", ] -[[package]] -name = "matches" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" - [[package]] name = "matchit" version = "0.5.0" @@ -2565,6 +2620,16 @@ dependencies = [ "winapi", ] +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + [[package]] name = "num-integer" version = "0.1.45" @@ -2639,7 +2704,7 @@ dependencies = [ "serde", "serde_json", "serde_path_to_error", - "sha2 0.10.5", + "sha2 0.10.6", "thiserror", "url", ] @@ -2667,9 +2732,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f7254b99e31cad77da24b08ebf628882739a608578bb1bcdfc1f9c21260d7c0" +checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1" [[package]] name = "opaque-debug" @@ -2679,9 +2744,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.41" +version = "0.10.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "618febf65336490dfcf20b73f885f5651a0c89c64c2d4a8c3662585a70bf5bd0" +checksum = "12fc0523e3bd51a692c8850d075d74dc062ccf251c0110668cbd921917118a13" dependencies = [ "bitflags", "cfg-if", @@ -2709,15 +2774,25 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +[[package]] +name = "openssl-src" +version = "111.22.0+1.1.1q" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f31f0d509d1c1ae9cada2f9539ff8f37933831fd5098879e482aa687d659853" +dependencies = [ + "cc", +] + [[package]] name = "openssl-sys" -version = "0.9.75" +version = "0.9.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5f9bd0c2710541a3cda73d6f9ac4f1b240de4ae261065d309dbe73d9dceb42f" +checksum = "5230151e44c0f05157effb743e8d517472843121cf9243e8b81393edb5acd9ce" dependencies = [ "autocfg", "cc", "libc", + "openssl-src", "pkg-config", "vcpkg", ] @@ -2728,6 +2803,12 @@ version = "6.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + [[package]] name = "parking" version = "2.0.0" @@ -2765,9 +2846,9 @@ checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1" [[package]] name = "percent-encoding" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "petgraph" @@ -2850,9 +2931,9 @@ checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" [[package]] name = "prettyplease" -version = "0.1.19" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a49e86d2c26a24059894a3afa13fd17d063419b05dfb83f06d9c3566060c3f5a" +checksum = "83fead41e178796ef8274dc612a7d8ce4c7e10ca35cd2c5b5ad24cac63aeb6c0" dependencies = [ "proc-macro2", "syn", @@ -2901,9 +2982,9 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro2" -version = "1.0.43" +version = "1.0.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" +checksum = "94e2ef8dbfc347b10c094890f778ee2e36ca9bb4262e86dc99cd217e35f3470b" dependencies = [ "unicode-ident", ] @@ -2965,9 +3046,9 @@ dependencies = [ [[package]] name = "psm" -version = "0.1.20" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f446d0a6efba22928558c4fb4ce0b3fd6c89b0061343e390bf01a703742b8125" +checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" dependencies = [ "cc", ] @@ -3026,7 +3107,7 @@ checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", "rand_chacha 0.3.1", - "rand_core 0.6.3", + "rand_core 0.6.4", ] [[package]] @@ -3046,7 +3127,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.3", + "rand_core 0.6.4", ] [[package]] @@ -3075,9 +3156,9 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ "getrandom 0.2.7", ] @@ -3251,9 +3332,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.11" +version = "0.11.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b75aa69a3f06bbcc66ede33af2af253c6f7a86b1ca0033f60c580a27074fbf92" +checksum = "431949c384f4e2ae07605ccaa56d1d9d2ecdb5cadd4f9577ccfab29f2e5149fc" dependencies = [ "base64 0.13.0", "bytes 1.2.1", @@ -3267,10 +3348,10 @@ dependencies = [ "hyper-tls", "ipnet", "js-sys", - "lazy_static", "log", "mime", "native-tls", + "once_cell", "percent-encoding", "pin-project-lite", "serde", @@ -3336,14 +3417,14 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.13", + "semver 1.0.14", ] [[package]] name = "rustix" -version = "0.35.9" +version = "0.35.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72c825b8aa8010eb9ee99b75f05e10180b9278d161583034d7574c9d617aeada" +checksum = "fbb2fda4666def1433b1b05431ab402e42a1084285477222b72d6c564c417cef" dependencies = [ "bitflags", "errno", @@ -3411,6 +3492,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +[[package]] +name = "scratch" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" + [[package]] name = "sct" version = "0.6.1" @@ -3455,9 +3542,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f6841e709003d68bb2deee8c343572bf446003ec20a583e76f7b15cebf3711" +checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" [[package]] name = "semver-parser" @@ -3467,9 +3554,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.144" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f747710de3dcd43b88c9168773254e809d8ddbdf9653b84e2554ab219f17860" +checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b" dependencies = [ "serde_derive", ] @@ -3488,9 +3575,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.144" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00" +checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c" dependencies = [ "proc-macro2", "quote", @@ -3499,9 +3586,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.85" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44" +checksum = "41feea4228a6f1cd09ec7a3593a682276702cd67b5273544757dae23c096f074" dependencies = [ "itoa", "ryu", @@ -3570,13 +3657,13 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9db03534dff993187064c4e0c05a5708d2a9728ace9a8959b77bedf415dac5" +checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.3", + "digest 0.10.5", ] [[package]] @@ -3694,7 +3781,7 @@ dependencies = [ "slight-events-api", "tracing", "url", - "uuid 1.1.2", + "uuid 1.2.1", "wasmtime", "wit-bindgen-wasmtime 0.2.0 (git+https://github.com/bytecodealliance/wit-bindgen?tag=v0.2.0)", "wit-error-rs", @@ -3778,7 +3865,7 @@ dependencies = [ "slight-runtime-configs", "tokio", "tracing", - "uuid 1.1.2", + "uuid 1.2.1", "wit-bindgen-wasmtime 0.2.0 (git+https://github.com/bytecodealliance/wit-bindgen?tag=v0.2.0)", "wit-error-rs", ] @@ -3797,7 +3884,7 @@ dependencies = [ "tokio", "tracing", "url", - "uuid 1.1.2", + "uuid 1.2.1", "wit-bindgen-wasmtime 0.2.0 (git+https://github.com/bytecodealliance/wit-bindgen?tag=v0.2.0)", "wit-error-rs", ] @@ -3819,7 +3906,7 @@ dependencies = [ "tokio", "tracing", "url", - "uuid 1.1.2", + "uuid 1.2.1", "wit-bindgen-wasmtime 0.2.0 (git+https://github.com/bytecodealliance/wit-bindgen?tag=v0.2.0)", "wit-error-rs", ] @@ -3840,7 +3927,7 @@ dependencies = [ "tokio", "tracing", "url", - "uuid 1.1.2", + "uuid 1.2.1", "wit-bindgen-wasmtime 0.2.0 (git+https://github.com/bytecodealliance/wit-bindgen?tag=v0.2.0)", "wit-error-rs", ] @@ -3888,7 +3975,7 @@ dependencies = [ "tempdir", "toml", "tracing", - "uuid 1.1.2", + "uuid 1.2.1", "wit-bindgen-wasmtime 0.2.0 (git+https://github.com/bytecodealliance/wit-bindgen?tag=v0.2.0)", "wit-error-rs", ] @@ -3906,9 +3993,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "snafu" @@ -3947,6 +4034,7 @@ version = "0.1.0" dependencies = [ "anyhow", "hyper", + "openssl", "rand 0.8.5", "serde", "short-crypt", @@ -4072,9 +4160,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.99" +version = "1.0.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13" +checksum = "3fcd952facd492f9be3ef0d0b7032a6e442ee9b361d4acc2b1d0c4aaa5f613a1" dependencies = [ "proc-macro2", "quote", @@ -4155,24 +4243,24 @@ dependencies = [ [[package]] name = "textwrap" -version = "0.15.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" +checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16" [[package]] name = "thiserror" -version = "1.0.34" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c1b05ca9d106ba7d2e31a9dab4a64e7be2cce415321966ea3132c49a656e252" +checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.34" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8f2591983642de85c921015f3f070c665a197ed69e417af436115e3a1407487" +checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" dependencies = [ "proc-macro2", "quote", @@ -4216,9 +4304,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3f9a28b618c3a6b9251b6908e9c99e04b9e5c02e6581ccbb67d59c34ef7f9b" +checksum = "d634a985c4d4238ec39cacaed2e7ae552fbd3c476b552c1deac3021b7d7eaf0c" dependencies = [ "itoa", "libc", @@ -4273,9 +4361,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.21.0" +version = "1.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89797afd69d206ccd11fb0ea560a44bbb87731d020670e79416d442919257d42" +checksum = "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099" dependencies = [ "autocfg", "bytes 1.2.1", @@ -4283,7 +4371,6 @@ dependencies = [ "memchr", "mio", "num_cpus", - "once_cell", "parking_lot", "pin-project-lite", "signal-hook-registry", @@ -4336,9 +4423,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.9" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df54d54117d6fdc4e4fea40fe1e4e566b3505700e148a6827e59b34b0d2600d9" +checksum = "d660770404473ccd7bc9f8b28494a811bc18542b915c0855c51e8f419d5223ce" dependencies = [ "futures-core", "pin-project-lite", @@ -4347,9 +4434,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45" +checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" dependencies = [ "bytes 1.2.1", "futures-core", @@ -4454,9 +4541,9 @@ dependencies = [ [[package]] name = "tower-layer" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "343bc9466d3fe6b0f960ef45960509f84480bf4fd96f92901afe7ff3df9d3a62" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" [[package]] name = "tower-service" @@ -4466,9 +4553,9 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.36" +version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fce9567bd60a67d08a16488756721ba392f24f29006402881e43b19aac64307" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if", "log", @@ -4479,9 +4566,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2" +checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ "proc-macro2", "quote", @@ -4490,9 +4577,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.29" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aeea4303076558a00714b823f9ad67d58a3bbda1df83d8827d21193156e22f7" +checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" dependencies = [ "once_cell", "valuable", @@ -4521,12 +4608,12 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60db860322da191b40952ad9affe65ea23e7dd6a5c442c2c42865810c6ab8e6b" +checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" dependencies = [ - "ansi_term", "matchers", + "nu-ansi-term", "once_cell", "regex", "sharded-slab", @@ -4566,36 +4653,36 @@ checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" [[package]] name = "unicode-ident" -version = "1.0.3" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf" +checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" [[package]] name = "unicode-normalization" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854cbdc4f7bc6ae19c820d44abdc3277ac3e1b2b93db20a636825d9322fb60e6" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" +checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" [[package]] name = "unicode-width" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" [[package]] name = "unicode-xid" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "universal-hash" @@ -4615,9 +4702,9 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "url" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22fe195a4f217c25b25cb5058ced57059824a678474874038dc88d211bf508d3" +checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" dependencies = [ "form_urlencoded", "idna", @@ -4642,9 +4729,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.1.2" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd6469f4314d5f1ffec476e05f17cc9a78bc7a27a6a857842170bdf8d6f98d2f" +checksum = "feb41e78f93363bb2df8b0e86a2ca30eed7806ea16ea0c790d757cf93f79be83" dependencies = [ "getrandom 0.2.7", ] @@ -4766,9 +4853,9 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.82" +version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d" +checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -4776,9 +4863,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.82" +version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f" +checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" dependencies = [ "bumpalo", "log", @@ -4791,9 +4878,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.32" +version = "0.4.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa76fb221a1f8acddf5b54ace85912606980ad661ac7a503b4570ffd3a624dad" +checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" dependencies = [ "cfg-if", "js-sys", @@ -4803,9 +4890,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.82" +version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602" +checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4813,9 +4900,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.82" +version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da" +checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" dependencies = [ "proc-macro2", "quote", @@ -4826,15 +4913,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.82" +version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a" +checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" [[package]] name = "wasm-encoder" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d443c5a7daae71697d97ec12ad70b4fe8766d3a0f4db16158ac8b781365892f7" +checksum = "c64ac98d5d61192cc45c701b7e4bd0b9aff91e2edfc7a088406cfe2288581e2c" dependencies = [ "leb128", ] @@ -5057,9 +5144,9 @@ dependencies = [ [[package]] name = "wast" -version = "46.0.0" +version = "47.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea0ab19660e3ea6891bba69167b9be40fad00fb1fe3dd39c5eebcee15607131b" +checksum = "02b98502f3978adea49551e801a6687678e6015317d7d9470a67fe813393f2a8" dependencies = [ "leb128", "memchr", @@ -5069,18 +5156,18 @@ dependencies = [ [[package]] name = "wat" -version = "1.0.48" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f775282def4d5bffd94d60d6ecd57bfe6faa46171cdbf8d32bd5458842b1e3e" +checksum = "7aab4e20c60429fbba9670a6cae0fff9520046ba0aa3e6d0b1cd2653bea14898" dependencies = [ - "wast 46.0.0", + "wast 47.0.1", ] [[package]] name = "web-sys" -version = "0.3.59" +version = "0.3.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed055ab27f941423197eb86b2035720b1a3ce40504df082cac2ecc6ed73335a1" +checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" dependencies = [ "js-sys", "wasm-bindgen", diff --git a/Cargo.toml b/Cargo.toml index 0ab568b4..5b456e4f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,6 +14,7 @@ short-crypt = "1" rand = "0.8" toml = "0.5" tempdir = "0.3" +openssl = { version = "0.10", features = ["vendored"] } [dev-dependencies] hyper = { version = "0.14", features = ["full"] } diff --git a/Makefile b/Makefile index b5a95f3f..47297e1f 100644 --- a/Makefile +++ b/Makefile @@ -45,7 +45,6 @@ install-deps-macos: sudo mv wasi-sdk-15.0/* /opt/wasi-sdk/ sudo rm -rf wasi-sdk-* chmod +x /opt/wasi-sdk/bin/clang - brew install openssl .PHONY: install-deps-win install-deps-win: @@ -56,7 +55,6 @@ install-deps-win: # tar -xvzf wasi-sdk-15.0-mingw.tar.gz # mkdir -p /opt/wasi-sdk # mv wasi-sdk-15.0/* /opt/wasi-sdk/ - choco install openssl .PHONY: install-slight @@ -150,12 +148,16 @@ run-restaurant-backend: ### GITHUB RELEASES .PHONY: prepare-release prepare-release: - tar -C target/ -czvf slight-unix.tar.gz release/slight + tar -C target/ -czvf slight-linux-x86_64.tar.gz release/slight tar -C templates/ -czvf rust-template.tar.gz rust tar -C templates/ -czvf c-template.tar.gz c .PHONY: prepare-release-win prepare-release-win: - tar -C target/ -czvf slight-win.tar.gz release/slight.exe + tar -C target/ -czvf slight-windows-x86_64.tar.gz release/slight.exe + +.PHONY: prepare-release-mac +prepare-release-mac: + tar -C target/ -czvf slight-macos-amd64.tar.gz release/slight ### END OF GITHUB RELEASES \ No newline at end of file diff --git a/build/azure-pipeline/workflow-pr.yml b/build/azure-pipeline/workflow-pr.yml index ec56a1c4..4452ace6 100644 --- a/build/azure-pipeline/workflow-pr.yml +++ b/build/azure-pipeline/workflow-pr.yml @@ -159,13 +159,7 @@ stages: # # Build - # - # - script: make build - # displayName: Build - # condition: and(succeeded(), eq(variables['target_os'], 'windows')) - # env: - # OPENSSL_DIR: C:\Program Files\OpenSSL-Win64\ - script: make build displayName: Build @@ -174,8 +168,6 @@ stages: - script: make build displayName: Build condition: and(succeeded(), eq(variables['target_os'], 'macos')) - env: - OPENSSL_ROOT_DIR: /usr/local/opt/openssl - script: make build-rust displayName: Build Rust Examples diff --git a/crates/pubsub/Cargo.toml b/crates/pubsub/Cargo.toml index bb47e56f..a9a525f7 100644 --- a/crates/pubsub/Cargo.toml +++ b/crates/pubsub/Cargo.toml @@ -24,5 +24,5 @@ tokio = { version = "1", features = ["full"] } # pubsub.confluent_apache_kafka deps rdkafka = { version = "0.28", features = ["cmake-build", "ssl"] } # pubsub.mosquitto -mosquitto-rs = { version = "0.4.0", features = ["default"]} +mosquitto-rs = { version = "0.4.0", features = ["default"] } async-channel = "1.5" \ No newline at end of file diff --git a/install.ps1 b/install.ps1 index 9a7ad7b7..bfb65c04 100644 --- a/install.ps1 +++ b/install.ps1 @@ -1,6 +1,6 @@ $INSTALL_DIR="C:\slight" $OWNER_AND_REPO="deislabds/spiderlightning" -$TAR="slight-win.tar.gz" +$TAR="slight-windows-x86_64.tar.gz" $BINARY_NAME="slight.exe" $LATEST_RELEASE="$(((Invoke-WebRequest "https://api.github.com/repos/$OWNER_AND_REPO/releases").Content | ConvertFrom-Json).tag_name | Select-Object -first 1)" diff --git a/install.sh b/install.sh index 157b9cef..204043b5 100644 --- a/install.sh +++ b/install.sh @@ -1,13 +1,30 @@ #!/bin/bash INSTALL_DIR="/usr/local" -OWNER_AND_REPO="deislabs/spiderlightning" -TAR="slight-unix.tar.gz" +OWNER_AND_REPO="${OWNER_AND_REPO:-deislabs/spiderlightning}" BINARY_NAME="slight" LATEST_RELEASE="$(curl -s https://api.github.com/repos/$OWNER_AND_REPO/releases | grep tag_name | awk 'NR == 1' | cut -d : -f 2 | cut -d \" -f 2)" echo ">>> LATEST RELEASE: $LATEST_RELEASE..." +OS="$(uname)" +ARCH="$(uname -m)" +if [[ "${OS}" == "Linux" ]] +then + TAR="slight-linux-x86_64.tar.gz" +elif [[ "${OS}" == "Darwin" ]] +then + if [[ "${ARCH}" == "arm64" ]] + then + TAR="slight-macos-aarch64.tar.gz" + else + TAR="slight-macos-amd64.tar.gz" + fi +else + echo ">>> THIS INSTALLATION METHOD ONLY WORKS FOR MACOS AND LINUX." + exit 1 +fi + URL="https://github.com/$OWNER_AND_REPO/releases/download/$LATEST_RELEASE/$TAR" echo ">>> DONLOADING FROM: $URL..."