From 4ec204ce811f78967702bcf174e7ddb28dee9a9d Mon Sep 17 00:00:00 2001 From: vms Date: Wed, 28 Apr 2021 16:27:09 +0300 Subject: [PATCH] uncomment autopublishing --- .github/workflows/publish_release.yml | 196 +++++++++++++------------- crates/fce-test-macro-impl/Cargo.toml | 2 +- crates/fce-test-macro/Cargo.toml | 4 +- fluence-test/Cargo.toml | 4 +- fluence/Cargo.toml | 2 +- fluence/src/call_parameters.rs | 4 +- 6 files changed, 105 insertions(+), 107 deletions(-) diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml index 59f3adb..df9ab8e 100644 --- a/.github/workflows/publish_release.yml +++ b/.github/workflows/publish_release.yml @@ -1,98 +1,98 @@ -#name: "publish-release" -# -#on: -# push: -# branches: -# - "master" -# -#jobs: -# npm-publish: -# name: "Publish release" -# runs-on: ubuntu-latest -# defaults: -# run: -# shell: bash -# -# steps: -# - name: Checkout repository -# uses: actions/checkout@v2 -# -# ### Prepare cargo & toolchains -# - uses: actions/cache@v2 -# with: -# path: | -# ~/.cargo/registry -# ~/.cargo/git -# ~/.cargo/bin -# target -# key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} -# - name: Install Rust toolchain with wasm32-unknown-unknown -# uses: actions-rs/toolchain@v1 -# with: -# toolchain: nightly -# profile: minimal -# override: true -# - uses: actions-rs/cargo@v1 -# with: -# toolchain: nightly -# command: update -# args: --aggressive -# -# ### Calculate FINAL_VERSION -# - name: Install jq & sponge -# run: sudo apt-get update && sudo apt-get --yes --force-yes install jq moreutils -# -# - name: Install cargo-show cargo-workspaces toml-cli -# run: cargo install cargo-show cargo-workspaces toml-cli || true -# -# - name: Calculate the version -# run: | -# # install semver and add it to PATH -# yarn global add semver -# PATH="$(yarn global bin):$PATH" -# -# CARGO_TOML="Cargo.toml" -# # get package name from Cargo.toml -# PKG_NAME="$(toml get "$CARGO_TOML" package.name | tr -d \")" -# # get version from Cargo.toml -# LOCAL_VERSION="$(toml get "$CARGO_TOML" package.version | tr -d \")" -# -# # Define accumulator array variable -# ALL_CRATES_VERSIONS=() -# -# # For all crates in the workspace accumulate its max_version -# for CRATE_NAME in $(cargo ws list) -# do -# CRATE_VERSION="$((cargo show --json "$CRATE_NAME" | jq -r .crate.max_version) 2>/dev/null || true)" -# ALL_CRATES_VERSIONS+=($CRATE_VERSION) -# done -# # Take the highest version of all -# MAX_CRATES_VERSION="$(semver -p ${ALL_CRATES_VERSIONS[@]} | tail -n1 || true)" -# # Increment patch octet of the highest version -# NEXT_CRATE_VERSION="$(semver --increment patch "${MAX_CRATES_VERSION}" || true)" -# -# # take the highest version -# MAX_VERSION="$(semver "$NEXT_CRATE_VERSION" "$LOCAL_VERSION" | tail -n1)" -# echo "FINAL_VERSION=$MAX_VERSION" | tee -a $GITHUB_ENV -# echo "PKG_NAME=$PKG_NAME" | tee -a $GITHUB_ENV -# -# ### === Rust package release === -# - name: Login to crates.io -# run: cargo login ${{ secrets.CRATES_IO_TOKEN }} -# -# - name: Publish to crates.io -# run: cargo ws publish --no-git-commit --allow-dirty --yes custom "${{ env.FINAL_VERSION }}" -# -# ### Create a pre-release -# - name: Create Release -# id: create_release -# uses: actions/create-release@v1 -# env: -# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} -# with: -# tag_name: ${{ env.FINAL_VERSION }} -# release_name: Fluence Rust SDK ${{ env.FINAL_VERSION }} -# body: | -# - [${{ env.FINAL_VERSION }} @ crates.io](https://crates.io/crates/${{ env.PKG_NAME }}/${{ env.FINAL_VERSION }}) -# draft: false -# prerelease: true \ No newline at end of file +name: "publish-release" + +on: + push: + branches: + - "master" + +jobs: + npm-publish: + name: "Publish release" + runs-on: ubuntu-latest + defaults: + run: + shell: bash + + steps: + - name: Checkout repository + uses: actions/checkout@v2 + + ### Prepare cargo & toolchains + - uses: actions/cache@v2 + with: + path: | + ~/.cargo/registry + ~/.cargo/git + ~/.cargo/bin + target + key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} + - name: Install Rust toolchain with wasm32-unknown-unknown + uses: actions-rs/toolchain@v1 + with: + toolchain: nightly + profile: minimal + override: true + - uses: actions-rs/cargo@v1 + with: + toolchain: nightly + command: update + args: --aggressive + + ### Calculate FINAL_VERSION + - name: Install jq & sponge + run: sudo apt-get update && sudo apt-get --yes --force-yes install jq moreutils + + - name: Install cargo-show cargo-workspaces toml-cli + run: cargo install cargo-show cargo-workspaces toml-cli || true + + - name: Calculate the version + run: | + # install semver and add it to PATH + yarn global add semver + PATH="$(yarn global bin):$PATH" + + CARGO_TOML="Cargo.toml" + # get package name from Cargo.toml + PKG_NAME="$(toml get "$CARGO_TOML" package.name | tr -d \")" + # get version from Cargo.toml + LOCAL_VERSION="$(toml get "$CARGO_TOML" package.version | tr -d \")" + + # Define accumulator array variable + ALL_CRATES_VERSIONS=() + + # For all crates in the workspace accumulate its max_version + for CRATE_NAME in $(cargo ws list) + do + CRATE_VERSION="$((cargo show --json "$CRATE_NAME" | jq -r .crate.max_version) 2>/dev/null || true)" + ALL_CRATES_VERSIONS+=($CRATE_VERSION) + done + # Take the highest version of all + MAX_CRATES_VERSION="$(semver -p ${ALL_CRATES_VERSIONS[@]} | tail -n1 || true)" + # Increment patch octet of the highest version + NEXT_CRATE_VERSION="$(semver --increment patch "${MAX_CRATES_VERSION}" || true)" + + # take the highest version + MAX_VERSION="$(semver "$NEXT_CRATE_VERSION" "$LOCAL_VERSION" | tail -n1)" + echo "FINAL_VERSION=$MAX_VERSION" | tee -a $GITHUB_ENV + echo "PKG_NAME=$PKG_NAME" | tee -a $GITHUB_ENV + + ### === Rust package release === + - name: Login to crates.io + run: cargo login ${{ secrets.CRATES_IO_TOKEN }} + + - name: Publish to crates.io + run: cargo ws publish --no-git-commit --allow-dirty --yes custom "${{ env.FINAL_VERSION }}" + + ### Create a pre-release + - name: Create Release + id: create_release + uses: actions/create-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: ${{ env.FINAL_VERSION }} + release_name: Fluence Rust SDK ${{ env.FINAL_VERSION }} + body: | + - [${{ env.FINAL_VERSION }} @ crates.io](https://crates.io/crates/${{ env.PKG_NAME }}/${{ env.FINAL_VERSION }}) + draft: false + prerelease: true \ No newline at end of file diff --git a/crates/fce-test-macro-impl/Cargo.toml b/crates/fce-test-macro-impl/Cargo.toml index 70cea71..946a8f7 100644 --- a/crates/fce-test-macro-impl/Cargo.toml +++ b/crates/fce-test-macro-impl/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fluence-sdk-test-macro-impl" -version = "0.1.2" # remember to update html_root_url +version = "0.1.3" # remember to update html_root_url edition = "2018" description = "Implementation of the `#[fce_test]` macro" repository = "https://github.com/fluencelabs/rust-sdk/crates/macro-test" diff --git a/crates/fce-test-macro/Cargo.toml b/crates/fce-test-macro/Cargo.toml index 4e5aec1..75442e9 100644 --- a/crates/fce-test-macro/Cargo.toml +++ b/crates/fce-test-macro/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fluence-sdk-test-macro" -version = "0.1.2" # remember to update html_root_url +version = "0.1.3" # remember to update html_root_url edition = "2018" description = "Definition of the `#[fce_test]` macro" repository = "https://github.com/fluencelabs/rust-sdk/crates/macro-test" @@ -17,7 +17,7 @@ proc-macro = true doctest = false [dependencies] -fluence-sdk-test-macro-impl = { path = "../fce-test-macro-impl", version = "0.1.2" } +fluence-sdk-test-macro-impl = { path = "../fce-test-macro-impl", version = "0.1.3" } quote = "1.0.9" proc-macro2 = "1.0.24" diff --git a/fluence-test/Cargo.toml b/fluence-test/Cargo.toml index 7ccc58b..f694e7a 100644 --- a/fluence-test/Cargo.toml +++ b/fluence-test/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fluence-test" -version = "0.1.2" # remember to update html_root_url +version = "0.1.3" # remember to update html_root_url description = "Fluence backend SDK for testing" documentation = "https://docs.rs/fluence/" repository = "https://github.com/fluencelabs/rust-sdk" @@ -19,7 +19,7 @@ path = "src/lib.rs" doctest = false [dependencies] -fluence-sdk-test-macro = { path = "../crates/fce-test-macro", version = "0.1.2" } +fluence-sdk-test-macro = { path = "../crates/fce-test-macro", version = "0.1.3" } fluence-app-service = { version = "0.7.0", features = ["raw-module-api"] } serde = { version = "1.0.118", features = ["derive"] } diff --git a/fluence/Cargo.toml b/fluence/Cargo.toml index f86ae77..eb47698 100644 --- a/fluence/Cargo.toml +++ b/fluence/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fluence" -version = "0.6.1" # remember to update html_root_url +version = "0.6.2" # remember to update html_root_url description = "Fluence backend SDK for developing backend applications for the Fluence network" documentation = "https://docs.rs/fluence/" repository = "https://github.com/fluencelabs/rust-sdk" diff --git a/fluence/src/call_parameters.rs b/fluence/src/call_parameters.rs index 96c0413..ff711ca 100644 --- a/fluence/src/call_parameters.rs +++ b/fluence/src/call_parameters.rs @@ -66,9 +66,7 @@ pub fn get_call_parameters() -> CallParameters { #[cfg(not(target_arch = "wasm32"))] pub fn get_call_parameters() -> CallParameters { - // return the default call parameters to allow compilation to native - // that needed for cargo test - <_>::default() + unimplemented!() } #[cfg(target_arch = "wasm32")]