From 64ab452d71e81e6cd1806670390c3e985a936232 Mon Sep 17 00:00:00 2001 From: Naveed Jooma Date: Tue, 9 Jan 2024 16:12:17 -0500 Subject: [PATCH 01/17] Test using buildjet in one step --- .github/workflows/release.yml | 79 ++++++++++++++++++----------------- 1 file changed, 41 insertions(+), 38 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 378f880..793f7d9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,9 +16,9 @@ on: jobs: prepare: if: github.repository_owner == 'viamrobotics' - runs-on: [buildjet-8vcpu-ubuntu-2204-arm] - container: - image: ghcr.io/viamrobotics/canon:arm64 + runs-on: [buildjet-2vcpu-ubuntu-2204-arm] + # container: + # image: ghcr.io/viamrobotics/canon:arm64 outputs: version: ${{ steps.which_version.outputs.version }} sha: ${{ steps.commit.outputs.commit_long_sha }} @@ -122,13 +122,16 @@ jobs: build_linux: if: github.repository_owner == 'viamrobotics' needs: [prepare] - runs-on: [self-hosted, x64] + runs-on: buildjet-2vcpu-ubuntu-2204 container: image: ghcr.io/cross-rs/${{ matrix.image }} strategy: fail-fast: false matrix: include: + - target: aarch64-unknown-linux-gnu + platform: linux_aarch64 + image: aarch64-unknown-linux-gnu:main-centos - target: x86_64-unknown-linux-gnu platform: linux_x86_64 image: x86_64-unknown-linux-gnu:main-centos @@ -163,42 +166,42 @@ jobs: name: builds path: builds - build_aarch64_linux: - if: github.repository_owner == 'viamrobotics' - needs: [prepare] - runs-on: [buildjet-8vcpu-ubuntu-2204-arm] - strategy: - fail-fast: false - steps: - - name: Checkout Code - uses: actions/checkout@v3 - with: - ref: ${{ needs.prepare.outputs.sha }} - # Variables for rust toolchain setup copied from the micro-rdk release - # process. - - name: Setup rust toolchain - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: 1.70.0 - override: true - target: aarch64-unknown-linux-gnu - default: true - - name: Setup build directory - run: mkdir builds - - name: Build - run: | - cargo build --release --locked --target aarch64-unknown-linux-gnu - cp target/aarch64-unknown-linux-gnu/release/libviam_rust_utils.so builds/libviam_rust_utils-linux_aarch64.so - cp target/aarch64-unknown-linux-gnu/release/libviam_rust_utils.a builds/libviam_rust_utils-linux_aarch64.a - - name: Upload artifacts - uses: actions/upload-artifact@v3 - with: - name: builds - path: builds + # build_aarch64_linux: + # if: github.repository_owner == 'viamrobotics' + # needs: [prepare] + # runs-on: [buildjet-8vcpu-ubuntu-2204-arm] + # strategy: + # fail-fast: false + # steps: + # - name: Checkout Code + # uses: actions/checkout@v3 + # with: + # ref: ${{ needs.prepare.outputs.sha }} + # # Variables for rust toolchain setup copied from the micro-rdk release + # # process. + # - name: Setup rust toolchain + # uses: actions-rs/toolchain@v1 + # with: + # profile: minimal + # toolchain: 1.70.0 + # override: true + # target: aarch64-unknown-linux-gnu + # default: true + # - name: Setup build directory + # run: mkdir builds + # - name: Build + # run: | + # cargo build --release --locked --target aarch64-unknown-linux-gnu + # cp target/aarch64-unknown-linux-gnu/release/libviam_rust_utils.so builds/libviam_rust_utils-linux_aarch64.so + # cp target/aarch64-unknown-linux-gnu/release/libviam_rust_utils.a builds/libviam_rust_utils-linux_aarch64.a + # - name: Upload artifacts + # uses: actions/upload-artifact@v3 + # with: + # name: builds + # path: builds release: - needs: [prepare, build_macos, build_linux, build_aarch64_linux] + needs: [prepare, build_macos, build_linux] if: github.repository_owner == 'viamrobotics' runs-on: [self-hosted, x64] container: From e78d4e49d25d626a4d50e7d98c09be72c25d21f7 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 9 Jan 2024 21:14:26 +0000 Subject: [PATCH 02/17] Bumping version to v0.1.4 [skip ci] --- Cargo.lock | 171 ++++++++++++++++++++++++++--------------------------- 1 file changed, 84 insertions(+), 87 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a2e5918..5c55f61 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -202,9 +202,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.77" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9d19de80eff169429ac1e9f48fffb163916b448a44e8e046186232046d9e1f9" +checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" dependencies = [ "backtrace", ] @@ -319,7 +319,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" dependencies = [ "concurrent-queue", - "event-listener 4.0.1", + "event-listener 4.0.3", "event-listener-strategy", "futures-core", "pin-project-lite", @@ -348,7 +348,7 @@ dependencies = [ "async-task", "concurrent-queue", "fastrand 2.0.1", - "futures-lite 2.1.0", + "futures-lite 2.2.0", "slab", ] @@ -363,7 +363,7 @@ dependencies = [ "async-io 2.2.2", "async-lock 3.2.0", "blocking", - "futures-lite 2.1.0", + "futures-lite 2.2.0", "once_cell", ] @@ -397,7 +397,7 @@ dependencies = [ "cfg-if 1.0.0", "concurrent-queue", "futures-io", - "futures-lite 2.1.0", + "futures-lite 2.2.0", "parking", "polling 3.3.1", "rustix 0.38.28", @@ -421,7 +421,7 @@ version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c" dependencies = [ - "event-listener 4.0.1", + "event-listener 4.0.3", "event-listener-strategy", "pin-project-lite", ] @@ -529,24 +529,24 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.48", ] [[package]] name = "async-task" -version = "4.6.0" +version = "4.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d90cd0b264dfdd8eb5bad0a2c217c1f88fa96a8573f40e7b12de23fb468f46" +checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" [[package]] name = "async-trait" -version = "0.1.75" +version = "0.1.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdf6721fb0140e4f897002dd086c06f6c27775df19cfe1fccb21181a48fd2c98" +checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.48", ] [[package]] @@ -646,9 +646,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.5" +version = "0.21.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "c79fed4cdb43e993fcdadc7e58a09fd0e3e649c4436fa11da71c9f1f3ee7feb9" [[package]] name = "base64ct" @@ -722,7 +722,7 @@ dependencies = [ "async-task", "fastrand 2.0.1", "futures-io", - "futures-lite 2.1.0", + "futures-lite 2.2.0", "piper", "tracing", ] @@ -827,9 +827,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.11" +version = "4.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" +checksum = "33e92c5c1a78c62968ec57dbc2440366a2d6e5a23faf829970ff1585dc6b18e2" dependencies = [ "clap_builder", "clap_derive", @@ -837,9 +837,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.11" +version = "4.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" +checksum = "f4323769dc8a61e2c39ad7dc26f6f2800524691a44d74fe3d1071a5c24db6370" dependencies = [ "anstream", "anstyle", @@ -856,7 +856,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.48", ] [[package]] @@ -904,9 +904,9 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cpufeatures" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] @@ -937,12 +937,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.18" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c" -dependencies = [ - "cfg-if 1.0.0", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crypto-bigint" @@ -1032,7 +1029,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.48", ] [[package]] @@ -1130,9 +1127,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", ] @@ -1213,7 +1210,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.48", ] [[package]] @@ -1328,9 +1325,9 @@ dependencies = [ [[package]] name = "event-listener" -version = "4.0.1" +version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84f2cdcf274580f2d63697192d744727b3198894b1bf02923643bf59e2c26712" +checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" dependencies = [ "concurrent-queue", "parking", @@ -1343,7 +1340,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" dependencies = [ - "event-listener 4.0.1", + "event-listener 4.0.3", "pin-project-lite", ] @@ -1494,9 +1491,9 @@ dependencies = [ [[package]] name = "futures-lite" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeee267a1883f7ebef3700f262d2d54de95dfaf38189015a74fdc4e0c7ad8143" +checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba" dependencies = [ "fastrand 2.0.1", "futures-core", @@ -1513,7 +1510,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.48", ] [[package]] @@ -1569,9 +1566,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if 1.0.0", "libc", @@ -1806,9 +1803,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.58" +version = "0.1.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1958,9 +1955,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.151" +version = "0.2.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" +checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" [[package]] name = "linked-hash-map" @@ -2081,9 +2078,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "memoffset" @@ -2455,7 +2452,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.48", ] [[package]] @@ -2493,9 +2490,9 @@ dependencies = [ [[package]] name = "platforms" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14e6ab3f592e6fb464fc9712d8d6e6912de6473954635fd76a589d832cffcbb0" +checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c" [[package]] name = "polling" @@ -2599,9 +2596,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.71" +version = "1.0.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75cb1540fadbd5b8fbccc4dddad2734eba435053f725621c070711a14bb5f4b8" +checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" dependencies = [ "unicode-ident", ] @@ -2668,9 +2665,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -2711,7 +2708,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.12", ] [[package]] @@ -2819,7 +2816,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" dependencies = [ "cc", - "getrandom 0.2.11", + "getrandom 0.2.12", "libc", "spin 0.9.8", "untrusted 0.9.0", @@ -2970,7 +2967,7 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64 0.21.5", + "base64 0.21.6", ] [[package]] @@ -3100,15 +3097,15 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.20" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" [[package]] name = "serde" -version = "1.0.193" +version = "1.0.195" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" dependencies = [ "serde_derive", ] @@ -3125,20 +3122,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.195" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.48", ] [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.111" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" dependencies = [ "itoa", "ryu", @@ -3343,9 +3340,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.43" +version = "2.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee659fb5f3d355364e1f3e5bc10fb82068efbf824a1e9d1c9504244a6469ad53" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" dependencies = [ "proc-macro2", "quote", @@ -3372,15 +3369,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.8.1" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" dependencies = [ "cfg-if 1.0.0", "fastrand 2.0.1", "redox_syscall", "rustix 0.38.28", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3394,22 +3391,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.52" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a48fd946b02c0a526b2e9481c8e2a17755e47039164a86c4070446e3a4614d" +checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.52" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7fbe9b594d6568a6a1443250a7e67d80b74e1e96f6d1715e1e21cc1888291d3" +checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.48", ] [[package]] @@ -3513,7 +3510,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.48", ] [[package]] @@ -3571,7 +3568,7 @@ dependencies = [ "async-stream 0.3.5", "async-trait", "axum", - "base64 0.21.5", + "base64 0.21.6", "bytes", "flate2", "futures-core", @@ -3684,7 +3681,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.48", ] [[package]] @@ -3857,7 +3854,7 @@ version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.12", ] [[package]] @@ -3868,9 +3865,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "value-bag" -version = "1.4.2" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a72e1902dde2bd6441347de2b70b7f5d59bf157c6c62f0c44572607a1d55bbe" +checksum = "7cdbaf5e132e593e9fc1de6a15bbec912395b11fb9719e061cf64f804524c503" [[package]] name = "version_check" @@ -3998,7 +3995,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.48", "wasm-bindgen-shared", ] @@ -4032,7 +4029,7 @@ checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.48", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4354,11 +4351,11 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-core" -version = "0.51.1" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.48.5", + "windows-targets 0.52.0", ] [[package]] @@ -4577,5 +4574,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.48", ] From b47999be1cd0f146105516c505f372eefb7e8b26 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 9 Jan 2024 21:23:46 +0000 Subject: [PATCH 03/17] Bumping version to v0.1.5 [skip ci] --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5c55f61..81404d5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3893,7 +3893,7 @@ dependencies = [ [[package]] name = "viam-rust-utils" -version = "0.1.4" +version = "0.1.5" dependencies = [ "anyhow", "async-stream 0.3.5", diff --git a/Cargo.toml b/Cargo.toml index 12bdf2e..d8ff940 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "viam-rust-utils" -version = "0.1.4" +version = "0.1.5" edition = "2021" license = "Apache-2.0" description = "Utilities designed for use with Viamrobotics's SDKs" From 611d2bd45604bb12b500fd3cf8c03ea71cd8da59 Mon Sep 17 00:00:00 2001 From: Naveed Jooma Date: Tue, 9 Jan 2024 16:31:55 -0500 Subject: [PATCH 04/17] Update runs-on per arch --- .github/workflows/release.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 793f7d9..5629e07 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -122,7 +122,7 @@ jobs: build_linux: if: github.repository_owner == 'viamrobotics' needs: [prepare] - runs-on: buildjet-2vcpu-ubuntu-2204 + runs-on: ${{ matrix.runs-on }} container: image: ghcr.io/cross-rs/${{ matrix.image }} strategy: @@ -132,12 +132,15 @@ jobs: - target: aarch64-unknown-linux-gnu platform: linux_aarch64 image: aarch64-unknown-linux-gnu:main-centos + runs-on: buildjet-2vcpu-ubuntu-2204-arm - target: x86_64-unknown-linux-gnu platform: linux_x86_64 image: x86_64-unknown-linux-gnu:main-centos + runs-on: buildjet-2vcpu-ubuntu-2204 - target: arm-unknown-linux-gnueabihf platform: linux_armv6l image: arm-unknown-linux-gnueabihf:main + runs-on: buildjet-2vcpu-ubuntu-2204 steps: - name: Checkout Code uses: actions/checkout@v3 From 238b219a27c297a6f7ffeaa6552e9f8303980c44 Mon Sep 17 00:00:00 2001 From: Naveed Jooma Date: Tue, 9 Jan 2024 16:48:38 -0500 Subject: [PATCH 05/17] Using ubuntu for aarch64 build --- .github/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5629e07..242d691 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -131,15 +131,15 @@ jobs: include: - target: aarch64-unknown-linux-gnu platform: linux_aarch64 - image: aarch64-unknown-linux-gnu:main-centos + image: ubuntu:20.04 runs-on: buildjet-2vcpu-ubuntu-2204-arm - target: x86_64-unknown-linux-gnu platform: linux_x86_64 - image: x86_64-unknown-linux-gnu:main-centos + image: ghcr.io/cross-rs/x86_64-unknown-linux-gnu:main-centos runs-on: buildjet-2vcpu-ubuntu-2204 - target: arm-unknown-linux-gnueabihf platform: linux_armv6l - image: arm-unknown-linux-gnueabihf:main + image: ghcr.io/cross-rs/arm-unknown-linux-gnueabihf:main runs-on: buildjet-2vcpu-ubuntu-2204 steps: - name: Checkout Code From b0d51c2ab01cc0249ed403795c3df1cd7d9dc505 Mon Sep 17 00:00:00 2001 From: Naveed Jooma Date: Tue, 9 Jan 2024 16:54:07 -0500 Subject: [PATCH 06/17] Fix image var --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 242d691..19126ec 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -124,7 +124,7 @@ jobs: needs: [prepare] runs-on: ${{ matrix.runs-on }} container: - image: ghcr.io/cross-rs/${{ matrix.image }} + image: ${{ matrix.image }} strategy: fail-fast: false matrix: From e31abe4792a6791a8fd5b09d881ee79162a9400a Mon Sep 17 00:00:00 2001 From: Naveed Jooma Date: Tue, 9 Jan 2024 16:54:35 -0500 Subject: [PATCH 07/17] Remove macos builds --- .github/workflows/release.yml | 78 +++++++++++++++++------------------ 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 19126ec..d0e960d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -78,45 +78,45 @@ jobs: default_author: github_actions message: Bumping version to v${{ steps.which_version.outputs.version }} [skip ci] - build_macos: - if: github.repository_owner == 'viamrobotics' - needs: [prepare] - runs-on: [self-hosted, ARM64, macOS] - strategy: - fail-fast: false - matrix: - include: - - target: aarch64-apple-darwin - platform: macosx_arm64 - - target: x86_64-apple-darwin - platform: macosx_x86_64 - steps: - - name: Checkout Code - uses: actions/checkout@v3 - with: - ref: ${{ needs.prepare.outputs.sha }} - - name: Setup rust toolchain - uses: dtolnay/rust-toolchain@stable - with: - toolchain: stable - targets: ${{ matrix.target }} - - name: Setup build directory - run: mkdir builds - - name: Build - run: | - cargo build --release --target=${{ matrix.target }} - - name: Copy - run: | - cp target/${{ matrix.target }}/release/libviam_rust_utils.dylib builds/libviam_rust_utils-${{ matrix.platform }}.dylib - cp target/${{ matrix.target }}/release/libviam_rust_utils.a builds/libviam_rust_utils-${{ matrix.platform }}.a - - name: Correct install path - run: | - install_name_tool -id "@rpath/libviam_rust_utils.dylib" builds/libviam_rust_utils-${{ matrix.platform }}.dylib - - name: Upload artifacts - uses: actions/upload-artifact@v3 - with: - name: builds - path: builds + # build_macos: + # if: github.repository_owner == 'viamrobotics' + # needs: [prepare] + # runs-on: [self-hosted, ARM64, macOS] + # strategy: + # fail-fast: false + # matrix: + # include: + # - target: aarch64-apple-darwin + # platform: macosx_arm64 + # - target: x86_64-apple-darwin + # platform: macosx_x86_64 + # steps: + # - name: Checkout Code + # uses: actions/checkout@v3 + # with: + # ref: ${{ needs.prepare.outputs.sha }} + # - name: Setup rust toolchain + # uses: dtolnay/rust-toolchain@stable + # with: + # toolchain: stable + # targets: ${{ matrix.target }} + # - name: Setup build directory + # run: mkdir builds + # - name: Build + # run: | + # cargo build --release --target=${{ matrix.target }} + # - name: Copy + # run: | + # cp target/${{ matrix.target }}/release/libviam_rust_utils.dylib builds/libviam_rust_utils-${{ matrix.platform }}.dylib + # cp target/${{ matrix.target }}/release/libviam_rust_utils.a builds/libviam_rust_utils-${{ matrix.platform }}.a + # - name: Correct install path + # run: | + # install_name_tool -id "@rpath/libviam_rust_utils.dylib" builds/libviam_rust_utils-${{ matrix.platform }}.dylib + # - name: Upload artifacts + # uses: actions/upload-artifact@v3 + # with: + # name: builds + # path: builds # build_linux builds all but aarch64. build_linux: From 0ec06969d3235eeafd7cb9695cf5ab2f61d8de42 Mon Sep 17 00:00:00 2001 From: Naveed Jooma Date: Tue, 9 Jan 2024 16:55:18 -0500 Subject: [PATCH 08/17] Remove macos dep --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d0e960d..1219a65 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -204,7 +204,7 @@ jobs: # path: builds release: - needs: [prepare, build_macos, build_linux] + needs: [prepare, build_linux] if: github.repository_owner == 'viamrobotics' runs-on: [self-hosted, x64] container: From 7cdbf758a49ddb68df98083833c2283686aa82a7 Mon Sep 17 00:00:00 2001 From: Naveed Jooma Date: Tue, 9 Jan 2024 17:20:36 -0500 Subject: [PATCH 09/17] Use rust image for aarch64 --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1219a65..a46b997 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -131,7 +131,7 @@ jobs: include: - target: aarch64-unknown-linux-gnu platform: linux_aarch64 - image: ubuntu:20.04 + image: rust runs-on: buildjet-2vcpu-ubuntu-2204-arm - target: x86_64-unknown-linux-gnu platform: linux_x86_64 From 4116f8582598e9c2c49b788301760af0ddd8201c Mon Sep 17 00:00:00 2001 From: Naveed Jooma Date: Tue, 9 Jan 2024 17:53:31 -0500 Subject: [PATCH 10/17] don't setup rust if using rust image --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a46b997..ccbd0ed 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -147,6 +147,7 @@ jobs: with: ref: ${{ needs.prepare.outputs.sha }} - name: Setup rust toolchain + if: ${{ matrix.image }} != 'rust' shell: bash run: | curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y From c0636ada94ee9a1850f0cb6109276501dc083074 Mon Sep 17 00:00:00 2001 From: Naveed Jooma Date: Tue, 9 Jan 2024 18:01:57 -0500 Subject: [PATCH 11/17] Use centos image --- .github/workflows/release.yml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ccbd0ed..a22c0a2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -131,7 +131,7 @@ jobs: include: - target: aarch64-unknown-linux-gnu platform: linux_aarch64 - image: rust + image: centos:7 runs-on: buildjet-2vcpu-ubuntu-2204-arm - target: x86_64-unknown-linux-gnu platform: linux_x86_64 @@ -142,12 +142,26 @@ jobs: image: ghcr.io/cross-rs/arm-unknown-linux-gnueabihf:main runs-on: buildjet-2vcpu-ubuntu-2204 steps: + - name: Setup dependencies + if: ${{ startsWith(matrix.image, 'centos') }} + shell: bash + run: | # (njooma) These are the deps that cross uses for cent-os. I haven't tried pruning/optimizing + yum install -y autoconf \ + automake \ + binutils \ + ca-certificates \ + curl \ + file \ + gcc \ + git \ + libtool \ + m4 \ + make - name: Checkout Code uses: actions/checkout@v3 with: ref: ${{ needs.prepare.outputs.sha }} - name: Setup rust toolchain - if: ${{ matrix.image }} != 'rust' shell: bash run: | curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y From 2a928edb1cd9d15c40b41b2d9b73884fa1658683 Mon Sep 17 00:00:00 2001 From: Naveed Jooma Date: Tue, 9 Jan 2024 18:18:19 -0500 Subject: [PATCH 12/17] Try locking the build --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a22c0a2..9a1f081 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -173,7 +173,7 @@ jobs: shell: bash run: | source "$HOME/.cargo/env" - cargo build --release --target=${{ matrix.target }} + cargo build --release --locked --target=${{ matrix.target }} - name: Copy run: | cp target/${{ matrix.target }}/release/libviam_rust_utils.so builds/libviam_rust_utils-${{ matrix.platform }}.so From 08b8e6f290fb5d28a87e0f7160d5f186f031ba6b Mon Sep 17 00:00:00 2001 From: Naveed Jooma Date: Tue, 9 Jan 2024 18:38:01 -0500 Subject: [PATCH 13/17] Try ubuntu 2004 with deps --- .github/workflows/release.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9a1f081..9516625 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -131,7 +131,7 @@ jobs: include: - target: aarch64-unknown-linux-gnu platform: linux_aarch64 - image: centos:7 + image: ubuntu:20.04 runs-on: buildjet-2vcpu-ubuntu-2204-arm - target: x86_64-unknown-linux-gnu platform: linux_x86_64 @@ -143,10 +143,11 @@ jobs: runs-on: buildjet-2vcpu-ubuntu-2204 steps: - name: Setup dependencies - if: ${{ startsWith(matrix.image, 'centos') }} + if: ${{ startsWith(matrix.image, 'ubuntu') }} shell: bash - run: | # (njooma) These are the deps that cross uses for cent-os. I haven't tried pruning/optimizing - yum install -y autoconf \ + run: | # (njooma) These are the deps that cross uses. I haven't tried pruning/optimizing + apt-get update && apt-get upgrade -y + apt-get install -y autoconf \ automake \ binutils \ ca-certificates \ From 2505f02b3100f2f722367a48a0ebe34ce075d320 Mon Sep 17 00:00:00 2001 From: Naveed Jooma Date: Wed, 10 Jan 2024 14:20:07 -0500 Subject: [PATCH 14/17] Add everything back --- .github/workflows/release.yml | 119 ++++++++++++---------------------- 1 file changed, 41 insertions(+), 78 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9516625..02ac174 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,8 +17,6 @@ jobs: prepare: if: github.repository_owner == 'viamrobotics' runs-on: [buildjet-2vcpu-ubuntu-2204-arm] - # container: - # image: ghcr.io/viamrobotics/canon:arm64 outputs: version: ${{ steps.which_version.outputs.version }} sha: ${{ steps.commit.outputs.commit_long_sha }} @@ -78,47 +76,46 @@ jobs: default_author: github_actions message: Bumping version to v${{ steps.which_version.outputs.version }} [skip ci] - # build_macos: - # if: github.repository_owner == 'viamrobotics' - # needs: [prepare] - # runs-on: [self-hosted, ARM64, macOS] - # strategy: - # fail-fast: false - # matrix: - # include: - # - target: aarch64-apple-darwin - # platform: macosx_arm64 - # - target: x86_64-apple-darwin - # platform: macosx_x86_64 - # steps: - # - name: Checkout Code - # uses: actions/checkout@v3 - # with: - # ref: ${{ needs.prepare.outputs.sha }} - # - name: Setup rust toolchain - # uses: dtolnay/rust-toolchain@stable - # with: - # toolchain: stable - # targets: ${{ matrix.target }} - # - name: Setup build directory - # run: mkdir builds - # - name: Build - # run: | - # cargo build --release --target=${{ matrix.target }} - # - name: Copy - # run: | - # cp target/${{ matrix.target }}/release/libviam_rust_utils.dylib builds/libviam_rust_utils-${{ matrix.platform }}.dylib - # cp target/${{ matrix.target }}/release/libviam_rust_utils.a builds/libviam_rust_utils-${{ matrix.platform }}.a - # - name: Correct install path - # run: | - # install_name_tool -id "@rpath/libviam_rust_utils.dylib" builds/libviam_rust_utils-${{ matrix.platform }}.dylib - # - name: Upload artifacts - # uses: actions/upload-artifact@v3 - # with: - # name: builds - # path: builds + build_macos: + if: github.repository_owner == 'viamrobotics' + needs: [prepare] + runs-on: [self-hosted, ARM64, macOS] + strategy: + fail-fast: false + matrix: + include: + - target: aarch64-apple-darwin + platform: macosx_arm64 + - target: x86_64-apple-darwin + platform: macosx_x86_64 + steps: + - name: Checkout Code + uses: actions/checkout@v3 + with: + ref: ${{ needs.prepare.outputs.sha }} + - name: Setup rust toolchain + uses: dtolnay/rust-toolchain@stable + with: + toolchain: stable + targets: ${{ matrix.target }} + - name: Setup build directory + run: mkdir builds + - name: Build + run: | + cargo build --release --target=${{ matrix.target }} + - name: Copy + run: | + cp target/${{ matrix.target }}/release/libviam_rust_utils.dylib builds/libviam_rust_utils-${{ matrix.platform }}.dylib + cp target/${{ matrix.target }}/release/libviam_rust_utils.a builds/libviam_rust_utils-${{ matrix.platform }}.a + - name: Correct install path + run: | + install_name_tool -id "@rpath/libviam_rust_utils.dylib" builds/libviam_rust_utils-${{ matrix.platform }}.dylib + - name: Upload artifacts + uses: actions/upload-artifact@v3 + with: + name: builds + path: builds - # build_linux builds all but aarch64. build_linux: if: github.repository_owner == 'viamrobotics' needs: [prepare] @@ -132,7 +129,7 @@ jobs: - target: aarch64-unknown-linux-gnu platform: linux_aarch64 image: ubuntu:20.04 - runs-on: buildjet-2vcpu-ubuntu-2204-arm + runs-on: buildjet-8vcpu-ubuntu-2204-arm - target: x86_64-unknown-linux-gnu platform: linux_x86_64 image: ghcr.io/cross-rs/x86_64-unknown-linux-gnu:main-centos @@ -185,42 +182,8 @@ jobs: name: builds path: builds - # build_aarch64_linux: - # if: github.repository_owner == 'viamrobotics' - # needs: [prepare] - # runs-on: [buildjet-8vcpu-ubuntu-2204-arm] - # strategy: - # fail-fast: false - # steps: - # - name: Checkout Code - # uses: actions/checkout@v3 - # with: - # ref: ${{ needs.prepare.outputs.sha }} - # # Variables for rust toolchain setup copied from the micro-rdk release - # # process. - # - name: Setup rust toolchain - # uses: actions-rs/toolchain@v1 - # with: - # profile: minimal - # toolchain: 1.70.0 - # override: true - # target: aarch64-unknown-linux-gnu - # default: true - # - name: Setup build directory - # run: mkdir builds - # - name: Build - # run: | - # cargo build --release --locked --target aarch64-unknown-linux-gnu - # cp target/aarch64-unknown-linux-gnu/release/libviam_rust_utils.so builds/libviam_rust_utils-linux_aarch64.so - # cp target/aarch64-unknown-linux-gnu/release/libviam_rust_utils.a builds/libviam_rust_utils-linux_aarch64.a - # - name: Upload artifacts - # uses: actions/upload-artifact@v3 - # with: - # name: builds - # path: builds - release: - needs: [prepare, build_linux] + needs: [prepare, build_macos, build_linux] if: github.repository_owner == 'viamrobotics' runs-on: [self-hosted, x64] container: From 24d740c7d75b5097b3c84754c4e18d0bf5ad9c9d Mon Sep 17 00:00:00 2001 From: Naveed Jooma Date: Wed, 10 Jan 2024 14:41:22 -0500 Subject: [PATCH 15/17] Increace vcpu sizes --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 02ac174..4bd5889 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -133,11 +133,11 @@ jobs: - target: x86_64-unknown-linux-gnu platform: linux_x86_64 image: ghcr.io/cross-rs/x86_64-unknown-linux-gnu:main-centos - runs-on: buildjet-2vcpu-ubuntu-2204 + runs-on: buildjet-4vcpu-ubuntu-2204 - target: arm-unknown-linux-gnueabihf platform: linux_armv6l image: ghcr.io/cross-rs/arm-unknown-linux-gnueabihf:main - runs-on: buildjet-2vcpu-ubuntu-2204 + runs-on: buildjet-4vcpu-ubuntu-2204 steps: - name: Setup dependencies if: ${{ startsWith(matrix.image, 'ubuntu') }} From d77d23b20c2c464ebfc686df79f02f4f4476c6ca Mon Sep 17 00:00:00 2001 From: Naveed Jooma Date: Wed, 10 Jan 2024 14:45:11 -0500 Subject: [PATCH 16/17] Bring Cargo.toml and lock back to main --- Cargo.lock | 173 +++++++++++++++++++++++++++-------------------------- Cargo.toml | 2 +- 2 files changed, 89 insertions(+), 86 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 81404d5..a2e5918 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -202,9 +202,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.79" +version = "1.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" +checksum = "c9d19de80eff169429ac1e9f48fffb163916b448a44e8e046186232046d9e1f9" dependencies = [ "backtrace", ] @@ -319,7 +319,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" dependencies = [ "concurrent-queue", - "event-listener 4.0.3", + "event-listener 4.0.1", "event-listener-strategy", "futures-core", "pin-project-lite", @@ -348,7 +348,7 @@ dependencies = [ "async-task", "concurrent-queue", "fastrand 2.0.1", - "futures-lite 2.2.0", + "futures-lite 2.1.0", "slab", ] @@ -363,7 +363,7 @@ dependencies = [ "async-io 2.2.2", "async-lock 3.2.0", "blocking", - "futures-lite 2.2.0", + "futures-lite 2.1.0", "once_cell", ] @@ -397,7 +397,7 @@ dependencies = [ "cfg-if 1.0.0", "concurrent-queue", "futures-io", - "futures-lite 2.2.0", + "futures-lite 2.1.0", "parking", "polling 3.3.1", "rustix 0.38.28", @@ -421,7 +421,7 @@ version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c" dependencies = [ - "event-listener 4.0.3", + "event-listener 4.0.1", "event-listener-strategy", "pin-project-lite", ] @@ -529,24 +529,24 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.43", ] [[package]] name = "async-task" -version = "4.7.0" +version = "4.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" +checksum = "e1d90cd0b264dfdd8eb5bad0a2c217c1f88fa96a8573f40e7b12de23fb468f46" [[package]] name = "async-trait" -version = "0.1.77" +version = "0.1.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +checksum = "fdf6721fb0140e4f897002dd086c06f6c27775df19cfe1fccb21181a48fd2c98" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.43", ] [[package]] @@ -646,9 +646,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.6" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c79fed4cdb43e993fcdadc7e58a09fd0e3e649c4436fa11da71c9f1f3ee7feb9" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "base64ct" @@ -722,7 +722,7 @@ dependencies = [ "async-task", "fastrand 2.0.1", "futures-io", - "futures-lite 2.2.0", + "futures-lite 2.1.0", "piper", "tracing", ] @@ -827,9 +827,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.14" +version = "4.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33e92c5c1a78c62968ec57dbc2440366a2d6e5a23faf829970ff1585dc6b18e2" +checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" dependencies = [ "clap_builder", "clap_derive", @@ -837,9 +837,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.14" +version = "4.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4323769dc8a61e2c39ad7dc26f6f2800524691a44d74fe3d1071a5c24db6370" +checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" dependencies = [ "anstream", "anstyle", @@ -856,7 +856,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.43", ] [[package]] @@ -904,9 +904,9 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" dependencies = [ "libc", ] @@ -937,9 +937,12 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c" +dependencies = [ + "cfg-if 1.0.0", +] [[package]] name = "crypto-bigint" @@ -1029,7 +1032,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.43", ] [[package]] @@ -1127,9 +1130,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.11" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc" dependencies = [ "powerfmt", ] @@ -1210,7 +1213,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.43", ] [[package]] @@ -1325,9 +1328,9 @@ dependencies = [ [[package]] name = "event-listener" -version = "4.0.3" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" +checksum = "84f2cdcf274580f2d63697192d744727b3198894b1bf02923643bf59e2c26712" dependencies = [ "concurrent-queue", "parking", @@ -1340,7 +1343,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" dependencies = [ - "event-listener 4.0.3", + "event-listener 4.0.1", "pin-project-lite", ] @@ -1491,9 +1494,9 @@ dependencies = [ [[package]] name = "futures-lite" -version = "2.2.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba" +checksum = "aeee267a1883f7ebef3700f262d2d54de95dfaf38189015a74fdc4e0c7ad8143" dependencies = [ "fastrand 2.0.1", "futures-core", @@ -1510,7 +1513,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.43", ] [[package]] @@ -1566,9 +1569,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if 1.0.0", "libc", @@ -1803,9 +1806,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.59" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1955,9 +1958,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.152" +version = "0.2.151" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" +checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" [[package]] name = "linked-hash-map" @@ -2078,9 +2081,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.1" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memoffset" @@ -2452,7 +2455,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.43", ] [[package]] @@ -2490,9 +2493,9 @@ dependencies = [ [[package]] name = "platforms" -version = "3.3.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c" +checksum = "14e6ab3f592e6fb464fc9712d8d6e6912de6473954635fd76a589d832cffcbb0" [[package]] name = "polling" @@ -2596,9 +2599,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "75cb1540fadbd5b8fbccc4dddad2734eba435053f725621c070711a14bb5f4b8" dependencies = [ "unicode-ident", ] @@ -2665,9 +2668,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.35" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -2708,7 +2711,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.12", + "getrandom 0.2.11", ] [[package]] @@ -2816,7 +2819,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" dependencies = [ "cc", - "getrandom 0.2.12", + "getrandom 0.2.11", "libc", "spin 0.9.8", "untrusted 0.9.0", @@ -2967,7 +2970,7 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64 0.21.6", + "base64 0.21.5", ] [[package]] @@ -3097,15 +3100,15 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.21" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" [[package]] name = "serde" -version = "1.0.195" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" dependencies = [ "serde_derive", ] @@ -3122,20 +3125,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.195" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.43", ] [[package]] name = "serde_json" -version = "1.0.111" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ "itoa", "ryu", @@ -3340,9 +3343,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.48" +version = "2.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "ee659fb5f3d355364e1f3e5bc10fb82068efbf824a1e9d1c9504244a6469ad53" dependencies = [ "proc-macro2", "quote", @@ -3369,15 +3372,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.9.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if 1.0.0", "fastrand 2.0.1", "redox_syscall", "rustix 0.38.28", - "windows-sys 0.52.0", + "windows-sys 0.48.0", ] [[package]] @@ -3391,22 +3394,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.56" +version = "1.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +checksum = "83a48fd946b02c0a526b2e9481c8e2a17755e47039164a86c4070446e3a4614d" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.56" +version = "1.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +checksum = "e7fbe9b594d6568a6a1443250a7e67d80b74e1e96f6d1715e1e21cc1888291d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.43", ] [[package]] @@ -3510,7 +3513,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.43", ] [[package]] @@ -3568,7 +3571,7 @@ dependencies = [ "async-stream 0.3.5", "async-trait", "axum", - "base64 0.21.6", + "base64 0.21.5", "bytes", "flate2", "futures-core", @@ -3681,7 +3684,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.43", ] [[package]] @@ -3854,7 +3857,7 @@ version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" dependencies = [ - "getrandom 0.2.12", + "getrandom 0.2.11", ] [[package]] @@ -3865,9 +3868,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "value-bag" -version = "1.6.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cdbaf5e132e593e9fc1de6a15bbec912395b11fb9719e061cf64f804524c503" +checksum = "4a72e1902dde2bd6441347de2b70b7f5d59bf157c6c62f0c44572607a1d55bbe" [[package]] name = "version_check" @@ -3893,7 +3896,7 @@ dependencies = [ [[package]] name = "viam-rust-utils" -version = "0.1.5" +version = "0.1.4" dependencies = [ "anyhow", "async-stream 0.3.5", @@ -3995,7 +3998,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.43", "wasm-bindgen-shared", ] @@ -4029,7 +4032,7 @@ checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.43", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4351,11 +4354,11 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-core" -version = "0.52.0" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.48.5", ] [[package]] @@ -4574,5 +4577,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.43", ] diff --git a/Cargo.toml b/Cargo.toml index d8ff940..12bdf2e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "viam-rust-utils" -version = "0.1.5" +version = "0.1.4" edition = "2021" license = "Apache-2.0" description = "Utilities designed for use with Viamrobotics's SDKs" From 85657114225612dda7c1286b612f1a8b73ac2a2a Mon Sep 17 00:00:00 2001 From: Naveed Jooma Date: Wed, 10 Jan 2024 15:04:32 -0500 Subject: [PATCH 17/17] Clean up runners --- .github/workflows/release.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4bd5889..f4bb6c4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ on: jobs: prepare: if: github.repository_owner == 'viamrobotics' - runs-on: [buildjet-2vcpu-ubuntu-2204-arm] + runs-on: buildjet-2vcpu-ubuntu-2204-arm outputs: version: ${{ steps.which_version.outputs.version }} sha: ${{ steps.commit.outputs.commit_long_sha }} @@ -185,9 +185,7 @@ jobs: release: needs: [prepare, build_macos, build_linux] if: github.repository_owner == 'viamrobotics' - runs-on: [self-hosted, x64] - container: - image: ghcr.io/viamrobotics/canon:amd64 + runs-on: buildjet-2vcpu-ubuntu-2204 steps: - uses: actions/download-artifact@v3