From b4818c57de6b319e3d48732022367512c1ca30ca Mon Sep 17 00:00:00 2001 From: Anatolios Laskaris Date: Mon, 27 Feb 2023 16:10:34 +0200 Subject: [PATCH] chore(release-please): Fix release (#487) * Revert "chore: release master (#484)" This reverts commit 4ae3afc0daf5f791f08742c1d250bb5b191852f6. * Revert "fix(air-trace): set correct air verison (#486)" This reverts commit c10f89b5e5856ed155da1dcb4784e73d63cc1bea. * Disable link version * Fix air --- .github/release-please/config.json | 23 +---------------------- .github/release-please/manifest.json | 6 +++--- Cargo.lock | 26 +++++++++++++------------- avm/server/CHANGELOG.md | 18 ------------------ avm/server/Cargo.toml | 4 ++-- crates/air-lib/test-utils/CHANGELOG.md | 4 ---- crates/air-lib/test-utils/Cargo.toml | 4 ++-- crates/data-store/CHANGELOG.md | 11 ----------- crates/data-store/Cargo.toml | 2 +- crates/testing-framework/Cargo.toml | 6 +++--- tools/cli/air-trace/CHANGELOG.md | 16 ---------------- tools/cli/air-trace/Cargo.toml | 6 +++--- 12 files changed, 28 insertions(+), 98 deletions(-) diff --git a/.github/release-please/config.json b/.github/release-please/config.json index 5dc3db80..f2763051 100644 --- a/.github/release-please/config.json +++ b/.github/release-please/config.json @@ -5,28 +5,7 @@ "bump-patch-for-minor-pre-major": true, "plugins": [ { - "type": "cargo-workspace", - "merge": false - }, - { - "type": "linked-versions", - "groupName": "air-interpreter", - "components": [ - "air", - "air-interpreter", - "avm-client" - ], - "merge": false - }, - { - "type": "linked-versions", - "groupName": "air-beautifier and air-beautify", - "components": [ - "air-beautifier", - "air-beautify", - "air-beautify-wasm" - ], - "merge": false + "type": "cargo-workspace" } ], "packages": { diff --git a/.github/release-please/manifest.json b/.github/release-please/manifest.json index d26bbd34..e01e6b3d 100644 --- a/.github/release-please/manifest.json +++ b/.github/release-please/manifest.json @@ -2,7 +2,7 @@ "air": "0.35.4", "air-interpreter": "0.35.4", "avm/interface": "0.28.2", - "avm/server": "0.30.0", + "avm/server": "0.29.0", "avm/client": "0.35.4", "crates/air-lib/air-parser": "0.7.3", "crates/air-lib/execution-info-collector": "0.7.2", @@ -12,9 +12,9 @@ "crates/air-lib/trace-handler": "0.1.1", "crates/air-lib/utils": "0.1.0", "crates/beautifier": "0.1.1", - "crates/data-store": "0.6.0", + "crates/data-store": "0.5.0", "crates/testing-framework": "0.1.2", "tools/cli/air-beautify": "0.1.1", - "tools/cli/air-trace": "0.2.5", + "tools/cli/air-trace": "0.2.4", "tools/wasm/air-beautify-wasm": "0.1.0" } diff --git a/Cargo.lock b/Cargo.lock index e84454ba..6f9fe528 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -52,7 +52,7 @@ dependencies = [ [[package]] name = "air-beautifier" -version = "0.1.2" +version = "0.1.1" dependencies = [ "air-parser", "itertools", @@ -61,7 +61,7 @@ dependencies = [ [[package]] name = "air-beautify" -version = "0.1.2" +version = "0.1.1" dependencies = [ "air-beautifier", "anyhow", @@ -70,7 +70,7 @@ dependencies = [ [[package]] name = "air-beautify-wasm" -version = "0.1.1" +version = "0.1.0" dependencies = [ "air-beautifier", "wasm-bindgen", @@ -78,7 +78,7 @@ dependencies = [ [[package]] name = "air-execution-info-collector" -version = "0.7.3" +version = "0.7.2" dependencies = [ "air-parser", ] @@ -111,7 +111,7 @@ dependencies = [ [[package]] name = "air-interpreter-data" -version = "0.6.3" +version = "0.6.2" dependencies = [ "air-interpreter-cid", "air-interpreter-interface", @@ -168,7 +168,7 @@ version = "0.1.0" [[package]] name = "air-parser" -version = "0.7.3" +version = "0.7.2" dependencies = [ "air-lambda-ast", "air-lambda-parser", @@ -190,7 +190,7 @@ dependencies = [ [[package]] name = "air-test-utils" -version = "0.4.3" +version = "0.4.2" dependencies = [ "air", "air-interpreter-cid", @@ -210,7 +210,7 @@ dependencies = [ [[package]] name = "air-testing-framework" -version = "0.1.3" +version = "0.1.2" dependencies = [ "air-parser", "air-test-utils", @@ -225,7 +225,7 @@ dependencies = [ [[package]] name = "air-trace" -version = "0.2.5" +version = "0.2.4" dependencies = [ "air", "air-interpreter-interface", @@ -242,7 +242,7 @@ dependencies = [ [[package]] name = "air-trace-handler" -version = "0.1.2" +version = "0.1.1" dependencies = [ "air-interpreter-cid", "air-interpreter-data", @@ -331,7 +331,7 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "avm-data-store" -version = "0.5.0" +version = "0.4.1" dependencies = [ "avm-interface", "serde", @@ -341,7 +341,7 @@ dependencies = [ [[package]] name = "avm-interface" -version = "0.28.2" +version = "0.28.1" dependencies = [ "air-interpreter-interface", "air-utils", @@ -356,7 +356,7 @@ dependencies = [ [[package]] name = "avm-server" -version = "0.29.0" +version = "0.28.1" dependencies = [ "air-interpreter-interface", "air-utils", diff --git a/avm/server/CHANGELOG.md b/avm/server/CHANGELOG.md index 3309ffe7..4f5527a5 100644 --- a/avm/server/CHANGELOG.md +++ b/avm/server/CHANGELOG.md @@ -4,24 +4,6 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [0.30.0](https://github.com/fluencelabs/aquavm/compare/avm-server-v0.29.0...avm-server-v0.30.0) (2023-02-27) - - -### ⚠ BREAKING CHANGES - -* **data_store:** use particle_id + current_peer_id as prev_data key in DataStore ([#485](https://github.com/fluencelabs/aquavm/issues/485)) - -### Bug Fixes - -* **data_store:** use particle_id + current_peer_id as prev_data key in DataStore ([#485](https://github.com/fluencelabs/aquavm/issues/485)) ([36e1c87](https://github.com/fluencelabs/aquavm/commit/36e1c8762c1888f375adacc21907d98a811d28d9)) - - -### Dependencies - -* The following workspace dependencies were updated - * dependencies - * avm-data-store bumped from 0.5.0 to 0.6.0 - ## [0.29.0](https://github.com/fluencelabs/aquavm/compare/avm-server-v0.28.1...avm-server-v0.29.0) (2023-02-21) diff --git a/avm/server/Cargo.toml b/avm/server/Cargo.toml index 3872839c..a471fa0e 100644 --- a/avm/server/Cargo.toml +++ b/avm/server/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "avm-server" description = "Fluence AIR VM" -version = "0.30.0" +version = "0.29.0" authors = ["Fluence Labs"] edition = "2018" license = "Apache-2.0" @@ -17,7 +17,7 @@ path = "src/lib.rs" [dependencies] air-interpreter-interface = { version = "0.12.1", path = "../../crates/air-lib/interpreter-interface" } air-utils = { version = "0.1.0", path = "../../crates/air-lib/utils" } -avm-data-store = { version = "0.6.0", path = "../../crates/data-store" } +avm-data-store = { version = "0.5.0", path = "../../crates/data-store" } marine-runtime = "0.24.1" polyplets = { version = "0.3.2", path = "../../crates/air-lib/polyplets" } avm-interface = { version = "0.28.2", path = "../../avm/interface" } diff --git a/crates/air-lib/test-utils/CHANGELOG.md b/crates/air-lib/test-utils/CHANGELOG.md index 72ff4624..2aad2b91 100644 --- a/crates/air-lib/test-utils/CHANGELOG.md +++ b/crates/air-lib/test-utils/CHANGELOG.md @@ -6,10 +6,6 @@ * avm-interface bumped from 0.28.1 to 0.28.2 * avm-server bumped from 0.28.1 to 0.29.0 -* The following workspace dependencies were updated - * dependencies - * avm-server bumped from 0.29.0 to 0.30.0 - ## [0.4.2](https://github.com/fluencelabs/aquavm/compare/air-test-utils-v0.4.1...air-test-utils-v0.4.2) (2023-02-08) diff --git a/crates/air-lib/test-utils/Cargo.toml b/crates/air-lib/test-utils/Cargo.toml index c6a674ea..f9ca3b98 100644 --- a/crates/air-lib/test-utils/Cargo.toml +++ b/crates/air-lib/test-utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "air-test-utils" -version = "0.4.4" +version = "0.4.3" description = "Test utils for the AIR interpreter" authors = ["Fluence Labs"] edition = "2018" @@ -19,7 +19,7 @@ air-interpreter-cid = { version = "0.2.0", path = "../interpreter-cid" } air-interpreter-data = { version = "0.6.3", path = "../interpreter-data" } air-interpreter-interface = { version = "0.12.1", path = "../interpreter-interface" } avm-interface = { version = "0.28.2", path = "../../../avm/interface" } -avm-server = { version = "0.30.0", path = "../../../avm/server" } +avm-server = { version = "0.29.0", path = "../../../avm/server" } marine-rs-sdk = "0.7.1" fstrings = "0.2.3" diff --git a/crates/data-store/CHANGELOG.md b/crates/data-store/CHANGELOG.md index 9fac140e..59eea691 100644 --- a/crates/data-store/CHANGELOG.md +++ b/crates/data-store/CHANGELOG.md @@ -4,17 +4,6 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [0.6.0](https://github.com/fluencelabs/aquavm/compare/avm-data-store-v0.5.0...avm-data-store-v0.6.0) (2023-02-27) - - -### ⚠ BREAKING CHANGES - -* **data_store:** use particle_id + current_peer_id as prev_data key in DataStore ([#485](https://github.com/fluencelabs/aquavm/issues/485)) - -### Bug Fixes - -* **data_store:** use particle_id + current_peer_id as prev_data key in DataStore ([#485](https://github.com/fluencelabs/aquavm/issues/485)) ([36e1c87](https://github.com/fluencelabs/aquavm/commit/36e1c8762c1888f375adacc21907d98a811d28d9)) - ## [0.5.0](https://github.com/fluencelabs/aquavm/compare/avm-data-store-v0.4.1...avm-data-store-v0.5.0) (2023-02-21) diff --git a/crates/data-store/Cargo.toml b/crates/data-store/Cargo.toml index 89a80a04..aa11a40d 100644 --- a/crates/data-store/Cargo.toml +++ b/crates/data-store/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "avm-data-store" -version = "0.6.0" +version = "0.5.0" description = "Definition of the AVM DataStore trait" authors = ["Fluence Labs"] edition = "2018" diff --git a/crates/testing-framework/Cargo.toml b/crates/testing-framework/Cargo.toml index a8702370..24b71424 100644 --- a/crates/testing-framework/Cargo.toml +++ b/crates/testing-framework/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "air-testing-framework" -version = "0.1.4" +version = "0.1.3" description = "AquaVM testing framework" authors = ["Fluence Labs"] edition = "2018" @@ -14,7 +14,7 @@ name = "air_test_framework" path = "src/lib.rs" [dependencies] -air-test-utils = { version = "0.4.4", path = "../air-lib/test-utils" } +air-test-utils = { version = "0.4.3", path = "../air-lib/test-utils" } air-parser = { version = "0.7.3", path = "../air-lib/air-parser" } itertools = "0.10.5" @@ -28,4 +28,4 @@ maplit = "1.0.2" pretty_assertions = "1.3.0" # We do not want to depend on wasm binary path -air-test-utils = { version = "0.4.4", path = "../air-lib/test-utils", features = ["test_with_native_code"] } +air-test-utils = { version = "0.4.3", path = "../air-lib/test-utils", features = ["test_with_native_code"] } diff --git a/tools/cli/air-trace/CHANGELOG.md b/tools/cli/air-trace/CHANGELOG.md index 9d5b85b7..6245bd1e 100644 --- a/tools/cli/air-trace/CHANGELOG.md +++ b/tools/cli/air-trace/CHANGELOG.md @@ -7,22 +7,6 @@ * avm-data-store bumped from 0.4.1 to 0.5.0 * avm-interface bumped from 0.28.1 to 0.28.2 -## [0.2.5](https://github.com/fluencelabs/aquavm/compare/air-trace-v0.2.4...air-trace-v0.2.5) (2023-02-27) - - -### Bug Fixes - -* **air-trace:** set correct air verison ([#486](https://github.com/fluencelabs/aquavm/issues/486)) ([c10f89b](https://github.com/fluencelabs/aquavm/commit/c10f89b5e5856ed155da1dcb4784e73d63cc1bea)) - - -### Dependencies - -* The following workspace dependencies were updated - * dependencies - * air bumped from 0.35.1 to 0.36.0 - * air-test-utils bumped from 0.4.3 to 0.4.4 - * avm-data-store bumped from 0.5.0 to 0.6.0 - ## [0.2.4](https://github.com/fluencelabs/aquavm/compare/air-trace-v0.2.3...air-trace-v0.2.4) (2023-02-08) diff --git a/tools/cli/air-trace/Cargo.toml b/tools/cli/air-trace/Cargo.toml index 6c0b371f..6824fab4 100644 --- a/tools/cli/air-trace/Cargo.toml +++ b/tools/cli/air-trace/Cargo.toml @@ -9,10 +9,10 @@ publish = false keywords = ["fluence", "air", "tracing"] [dependencies] -air = { version = "0.36.0", path = "../../../air" } -air-test-utils = { version = "0.4.4",path = "../../../crates/air-lib/test-utils", optional = true } +air = { version = "0.35.1", path = "../../../air" } +air-test-utils = { version = "0.4.3",path = "../../../crates/air-lib/test-utils", optional = true } air-interpreter-interface = { version = "0.12.1", path = "../../../crates/air-lib/interpreter-interface", default-features = false } -avm-data-store = { version = "0.6.0", path = "../../../crates/data-store" } +avm-data-store = { version = "0.5.0", path = "../../../crates/data-store" } avm-interface = { version = "0.28.2", path = "../../../avm/interface" } anyhow = "1.0.69"