From b5bfd18212e4404834cb23096e2aa91e6df9129b Mon Sep 17 00:00:00 2001 From: bmc-msft <41130664+bmc-msft@users.noreply.github.com> Date: Fri, 18 Nov 2022 13:21:43 -0500 Subject: [PATCH] prep 0.9.1 release (#209) --- Cargo.lock | 58 ++++++++++++++++---------------- Cargo.toml | 2 +- README.md | 2 +- eng/build.sh | 3 +- eng/release.sh | 9 ++--- eng/test-azure-image.sh | 11 +++--- eng/{run.sh => test-on-azure.sh} | 11 +++--- 7 files changed, 48 insertions(+), 48 deletions(-) rename eng/{run.sh => test-on-azure.sh} (90%) diff --git a/Cargo.lock b/Cargo.lock index 11506ec..979b388 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -55,7 +55,7 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "avml" -version = "0.9.0" +version = "0.9.1" dependencies = [ "async-channel", "atty", @@ -201,9 +201,9 @@ checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" [[package]] name = "cc" -version = "1.0.73" +version = "1.0.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +checksum = "76a284da2e6fe2092f2353e51713435363112dfd60030e22add80be333fb928f" [[package]] name = "cfg-if" @@ -305,9 +305,9 @@ dependencies = [ [[package]] name = "digest" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" dependencies = [ "block-buffer", "crypto-common", @@ -629,9 +629,9 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "hyper" -version = "0.14.20" +version = "0.14.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02c929dc5c39e335a03c405292728118860721b10190d98c2a0f0efd5baafbac" +checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c" dependencies = [ "bytes", "futures-channel", @@ -676,9 +676,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.1" +version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" +checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" dependencies = [ "autocfg", "hashbrown", @@ -713,9 +713,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.5.0" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" +checksum = "f88c5561171189e69df9d98bcf18fd5f9558300f7ea7b801eb8a0fd748bd8745" [[package]] name = "itoa" @@ -803,9 +803,9 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" +checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" dependencies = [ "hermit-abi", "libc", @@ -828,9 +828,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "once_cell" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1" +checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" [[package]] name = "openssl" @@ -866,9 +866,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "111.22.0+1.1.1q" +version = "111.24.0+1.1.1s" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f31f0d509d1c1ae9cada2f9539ff8f37933831fd5098879e482aa687d659853" +checksum = "3498f259dab01178c6228c6b00dcef0ed2a2d5e20d648c017861227773ea4abd" dependencies = [ "cc", ] @@ -889,9 +889,9 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.3.0" +version = "6.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" +checksum = "7b5bf27447411e9ee3ff51186bf7a08e16c341efdde93f4d823e8844429bed7e" [[package]] name = "parking" @@ -957,9 +957,9 @@ checksum = "15eb2c6e362923af47e13c23ca5afb859e83d54452c55b0b9ac763b8f7c1ac16" [[package]] name = "ppv-lite86" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro-error" @@ -1218,9 +1218,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.87" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45" +checksum = "8e8b3801309262e8184d9687fb697586833e939767aea0dda89f5a8e650e8bd7" dependencies = [ "itoa", "ryu", @@ -1349,9 +1349,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fab5c8b9980850e06d92ddbe3ab839c062c801f3927c0fb8abd6fc8e918fbca" +checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" dependencies = [ "itoa", "libc", @@ -1369,9 +1369,9 @@ checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" [[package]] name = "time-macros" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65bb801831d812c562ae7d2bfb531f26e66e4e1f6b17307ba4149c5064710e5b" +checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" dependencies = [ "time-core", ] @@ -1511,9 +1511,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feb41e78f93363bb2df8b0e86a2ca30eed7806ea16ea0c790d757cf93f79be83" +checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c" dependencies = [ "getrandom 0.2.8", ] diff --git a/Cargo.toml b/Cargo.toml index b854351..5800ecf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "avml" -version = "0.9.0" +version = "0.9.1" license = "MIT" description = "A portable volatile memory acquisition tool" authors = ["avml@microsoft.com"] diff --git a/README.md b/README.md index 5078c50..6e4d8c2 100644 --- a/README.md +++ b/README.md @@ -170,7 +170,7 @@ The testing scripts will create, use, and cleanup a number of resource groups, v 1. Install [az cli](https://docs.microsoft.com/en-us/cli/azure/install-azure-cli) 2. Login to your Azure subscription using: `az login` 3. Build avml (see above) -4. ./eng/run.sh +4. ./eng/test-on-azure.sh # Contributing diff --git a/eng/build.sh b/eng/build.sh index 0ab941d..8b4fae3 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -7,6 +7,7 @@ DEBIAN_FRONTEND=noninteractive sudo apt-get install musl-dev musl-tools musl rustup component add rustfmt rustup target add x86_64-unknown-linux-musl +rustup update stable cargo fmt -- --check cargo build --release --no-default-features --target x86_64-unknown-linux-musl --locked @@ -14,7 +15,7 @@ cp target/x86_64-unknown-linux-musl/release/avml target/x86_64-unknown-linux-mus cargo build --release --target x86_64-unknown-linux-musl --locked cargo build --release --target x86_64-unknown-linux-musl --locked --bin avml-upload --features "put blobstore status" cargo test --release --target x86_64-unknown-linux-musl --locked -cargo clippy -- -D clippy::pedantic -A clippy::missing_errors_doc +cargo clippy --locked --all-targets --all-features -- -D warnings -D clippy::pedantic -A clippy::missing_errors_doc strip target/x86_64-unknown-linux-musl/release/avml strip target/x86_64-unknown-linux-musl/release/avml-minimal strip target/x86_64-unknown-linux-musl/release/avml-convert diff --git a/eng/release.sh b/eng/release.sh index 541f765..e04b3c4 100755 --- a/eng/release.sh +++ b/eng/release.sh @@ -2,11 +2,6 @@ set -ex -rustup update -cargo update -cargo test --target x86_64-unknown-linux-musl --release -cargo build --target x86_64-unknown-linux-musl --release --locked --no-default-features -cp target/x86_64-unknown-linux-musl/release/avml target/x86_64-unknown-linux-musl/release/avml-minimal -cargo build --target x86_64-unknown-linux-musl --release --locked -./eng/run.sh +./eng/build.sh +./eng/test-on-azure.sh cargo package --locked diff --git a/eng/test-azure-image.sh b/eng/test-azure-image.sh index eea020f..d91195d 100755 --- a/eng/test-azure-image.sh +++ b/eng/test-azure-image.sh @@ -6,15 +6,16 @@ set -e -CONFIG=/tmp/test-config.json.`date '+%Y-%m-%d-%H-%M-%S'`.$$ +INSTANCE=$(uuidgen) +LOG=/tmp/avml-test-${INSTANCE}.log +CONFIG=/tmp/test-config.json.${INSTANCE} +GROUP=vm-capture-test-${INSTANCE} +VM=${INSTANCE} +REGION=eastus TOOL_URL=${1} SKU=${2:-RedHat:RHEL:8:8.0.2019050711} SIZE=${3:-Standard_B1ls} -REGION=eastus -GROUP=vm-capture-test-`date '+%Y-%m-%d-%H-%M-%S'`-$$ -VM=$(uuidgen) -LOG=/tmp/avml-test-$(dd if=/dev/urandom | tr -dc 'a-z0-9' | fold -w 24 | head -n 1).log function fail { echo ERROR cat "${LOG}" diff --git a/eng/run.sh b/eng/test-on-azure.sh similarity index 90% rename from eng/run.sh rename to eng/test-on-azure.sh index 5f176f3..a6fc519 100755 --- a/eng/run.sh +++ b/eng/test-on-azure.sh @@ -6,18 +6,21 @@ set -e -LOG=/tmp/.log_$$.txt + +INSTANCE=$(uuidgen) +LOG=/tmp/avml-test-log-${INSTANCE}.txt +GROUP=vm-capture-test-${INSTANCE} +REGION=eastus + IMAGES_TXT=${1:-eng/images.txt} FILE=${2:-target/x86_64-unknown-linux-musl/release/avml} -GROUP=vm-capture-test-`date '+%Y-%m-%d-%H-%M-%S'`-$$ -REGION=eastus STORAGE=$(dd if=/dev/urandom | tr -dc 'a-z0-9' | fold -w 24 | head -n 1) DST_PATH=$(dd if=/dev/urandom | tr -dc 'a-z0-9' | fold -w 24 | head -n 1)/avml CONTAINER=tools URL=https://${STORAGE}.blob.core.windows.net/${CONTAINER}/${DST_PATH} -LOG=/tmp/$(dd if=/dev/urandom | tr -dc 'a-z0-9' | fold -w 24 | head -n 1).log +LOG=/tmp/avml-run-${INSTANCE}.log function fail { echo ERROR cat "${LOG}"