CI: respect version in Cargo.toml (#54)

.github/workflows/publish_interpreter.yml

@@ -57,13 +57,32 @@ jobs:
 
       - name: Get versions from npm & crates.io, and take the highest one
         run: |
+          # install semver and add it to PATH
           yarn global add semver
           PATH="$(yarn global bin):$PATH"
-          JS_VERSION="$(yarn info --silent @fluencelabs/aquamarine-stepper version || true)"
+
-          RS_VERSION="$((cargo show --json air-interpreter-wasm | jq -r .crate.max_version) 2>/dev/null || true)"
+          CARGO_TOML="crates/air-interpreter-wasm/Cargo.toml"
-          MAX_VERSION="$(semver "$JS_VERSION" "$RS_VERSION" "0.0.0" | tail -n1)"
+          # get package name from Cargo.toml
-          FINAL_VERSION="$(semver --increment patch "$MAX_VERSION")"
+          RS_PKG_NAME="$(toml get "$CARGO_TOML" package.name | tr -d \")"
-          echo "FINAL_VERSION=$FINAL_VERSION" | tee -a $GITHUB_ENV
+          JS_PKG_NAME="@fluencelabs/aquamarine-stepper"
+
+          # get version from Cargo.toml
+          LOCAL_RUST_VERSION="$(toml get "$CARGO_TOML" package.version | tr -d \")"
+
+          # get & increment version from NPM
+          JS_VERSION="$(yarn info --silent "$JS_PKG_NAME" version || true)"
+          NEXT_JS_VERSION="$(semver --increment patch "$JS_VERSION" || true)"
+
+          # get & increment version from crates.io
+          RS_VERSION="$((cargo show --json "$RS_PKG_NAME" | jq -r .crate.max_version) 2>/dev/null || true)"
+          NEXT_RS_VERSION="$(semver --increment patch "$RS_VERSION" || true)"
+
+          # take the highest version
+          MAX_VERSION="$(semver "$NEXT_JS_VERSION" "$NEXT_RS_VERSION" "$LOCAL_RUST_VERSION" | tail -n1)"
+
+          echo "FINAL_VERSION=$MAX_VERSION" | tee -a $GITHUB_ENV
+          echo "PKG_NAME=$PKG_NAME" | tee -a $GITHUB_ENV
+          echo "JS_PKG_NAME=$JS_PKG_NAME" | tee -a $GITHUB_ENV
 
 ### === JavaScript package release ===
       - name: Install wasm-pack
@@ -101,7 +120,7 @@ jobs:
           cat pkg/package.json | jq --arg name aquamarine.wasm.base64.js \
             '. + {
               files: [ "aquamarine.wasm.base64.js", "aquamarine.wasm.base64.d.ts",  "index.js", "index.d.ts" ],
-              "name": "@fluencelabs/aquamarine-stepper",
+              "name": "${{ env.JS_PKG_VERSION }}",
               "description": "Aquamarine IR interpreter as base64 WASM",
               "main": "index.js",
               "repository": "https://github.com/fluencelabs/aquamarine",
@@ -127,13 +146,16 @@ jobs:
           EOF
         working-directory: pkg
 
-    ### Publish aquamarine-stepper to NPM
+      ### Publish to NPM registry
-      - uses: JS-DevTools/npm-publish@v1
+      - uses: actions/setup-node@v1
         with:
-          package: pkg/package.json
+          node-version: '14'
-          access: public
+          registry-url: 'https://registry.npmjs.org'
-          check-version: false
+
-          token: ${{ secrets.NPM_TOKEN }}
+      - run: npm publish --access public
+        working-directory: pkg
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
 
 ### === Rust package release ===
       - name: Install fcli toml-cli
@@ -146,10 +168,13 @@ jobs:
       - name: Copy aquamarine.wasm to air-interpreter-wasm
         run: cp target/wasm32-wasi/release/aquamarine.wasm crates/air-interpreter-wasm/aquamarine.wasm
 
-      - name: Set project version to ${{ env.FINAL_VERSION }}
+      - name: Set project name@version to ${{ env.PKG_NAME }}@${{ env.FINAL_VERSION }}
         run: |
           PATH="~/.cargo/bin:$PATH"
           toml set Cargo.toml package.version "${{ env.FINAL_VERSION }}" | sponge Cargo.toml
+
+          NAME=$(toml get Cargo.toml package.name | jq -r .)
+          toml set Cargo.toml package.name "${{ env.PKG_NAME }}" | sponge Cargo.toml
         working-directory: crates/air-interpreter-wasm
 
       - name: Login to crates.io
@@ -160,12 +185,16 @@ jobs:
         working-directory: crates/air-interpreter-wasm
 
 ### Create a pre-release
-      - uses: marvinpinto/action-automatic-releases@latest
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          repo_token: "${{ secrets.GITHUB_TOKEN }}"
+          tag_name: ${{ env.FINAL_VERSION }}
-          automatic_release_tag: "${{ env.FINAL_VERSION }}"
+          release_name: Fluence Network ${{ env.FINAL_VERSION }}
-          prerelease: true
+          body: |
-          title: "Aquamarine ${{ env.FINAL_VERSION }}"
+            - [${{ env.FINAL_VERSION }} @ NPM registry](https://www.npmjs.com/package/${{ env.JS_PKG_NAME }}/v/${{ env.FINAL_VERSION }})
-          files: |
+            - [${{ env.FINAL_VERSION }} @ crates.io](https://crates.io/crates/${{ env.PKG_NAME }}/${{ env.FINAL_VERSION }})
-            LICENSE
+          draft: false
-            target/wasm32-wasi/release/aquamarine.wasm
+          prerelease: false

.github/workflows/publish_interpreter_dev.yml

@@ -61,18 +61,56 @@ jobs:
       - name: Install jq & sponge
         run: sudo apt-get update && sudo apt-get --yes --force-yes install jq moreutils
 
-      - name: Install cargo-show
+      - name: Install cargo-show & toml-cli
-        run: cargo install cargo-show || true
+        run: cargo install cargo-show toml-cli || true
 
       - name: Get versions from npm & crates.io, and take the highest one
         run: |
+          # install semver and add it to PATH
           yarn global add semver
           PATH="$(yarn global bin):$PATH"
-          JS_VERSION="$(yarn info --silent @fluencelabs/aquamarine-stepper-${{ env.BRANCH_NAME }} version || true)"
+
-          RS_VERSION="$((cargo show --json air-interpreter-wasm-${{ env.BRANCH_NAME }} | jq -r .crate.max_version) 2>/dev/null || true)"
+          CARGO_TOML="crates/air-interpreter-wasm/Cargo.toml"
-          MAX_VERSION="$(semver "$JS_VERSION" "$RS_VERSION" "0.0.0" | tail -n1)"
+
-          FINAL_VERSION="$(semver --increment patch "$MAX_VERSION")"
+          # sanitize branch name so it can be used as a semver suffix (replace [^0-9a-zA-Z-] with hyphen)
-          echo "FINAL_VERSION=$FINAL_VERSION" | tee -a $GITHUB_ENV
+          SANITIZED_BRANCH="$(echo -n "${{ env.BRANCH_NAME }}" | tr -C '[:alnum:]-' -)"
+
+          # get package name from Cargo.toml
+          PKG_NAME="$(toml get "$CARGO_TOML" package.name | tr -d \")"
+          JS_PKG_NAME="@fluencelabs/aquamarine-stepper"
+
+          ### NPM
+          # take all versions from npm and replace single quotes with double quotes
+          NPM_VERSIONS=$(yarn info --silent "$JS_PKG_NAME" versions 2>/dev/null | tr \' \")
+          # take only versions that contain branch name
+          NPM_VERSIONS_FILTERED=$(echo $NPM_VERSIONS | jq -r ".[] | select(contains(\"$SANITIZED_BRANCH\"))")
+          # flatten into a single line
+          NPM_VERSIONS_FLATTENED=$(echo $NPM_VERSIONS_FILTERED | awk '{print}' ORS=' ')
+          # sort versions according to semver, take highest (last)
+          LAST_NPM_VERSION="$(semver -p $(echo $NPM_VERSIONS_FLATTENED) | tail -n1 || true)"
+          # increment prerelease part of the version
+          PRERELEASE_NPM_VERSION="$(semver --increment prerelease --preid "$SANITIZED_BRANCH" "${LAST_NPM_VERSION}" || true)"
+
+          ### CRATES.IO
+          CRATE_VERSIONS=$(cargo show --json "$PKG_NAME")
+          CRATE_VERSIONS_FILTERED=$(echo $CRATE_VERSIONS | jq -r ".versions[] | .num | select(contains(\"$SANITIZED_BRANCH\"))")
+          CRATE_VERSIONS_FLATTENED=$(echo $CRATE_VERSIONS_FILTERED | awk '{print}' ORS=' ')
+          LAST_CRATE_VERSION="$(semver -p $(echo $CRATE_VERSIONS_FLATTENED) | tail -n1 || true)"
+          PRERELEASE_CRATE_VERSION="$(semver --increment prerelease --preid "$SANITIZED_BRANCH" "${LAST_CRATE_VERSION}" || true)"
+
+          ### LOCAL
+          ### (NOTE: the following code assumes that local versions do not contain prerelease suffix; existing suffix will be ignored)
+          # take local Rust version
+          LOCAL_RUST_VERSION="$(toml get "$CARGO_TOML" package.version | tr -d \")"
+          LOCAL_RUST_PRERELEASE_VERSION="$(semver --increment prerelease --preid "$SANITIZED_BRANCH" "${LOCAL_RUST_VERSION}-0")" # added '-0' here to avoid semver erroneously increment patch octet. Any suffix works, '-0' is chosen deliberately.
+
+          ### SAVE FINAL VERSION TO ENV
+          # take the highest version
+          MAX_VERSION="$(semver "$LOCAL_RUST_PRERELEASE_VERSION" "$PRERELEASE_NPM_VERSION" "$PRERELEASE_CRATE_VERSION" | tail -n1)"
+          # save info to env
+          echo "FINAL_VERSION=$MAX_VERSION" | tee -a $GITHUB_ENV
+          echo "PKG_NAME=$PKG_NAME" | tee -a $GITHUB_ENV
+          echo "JS_PKG_NAME=$JS_PKG_NAME" | tee -a $GITHUB_ENV
 
 ### === JavaScript package release ===
       - name: Install wasm-pack
@@ -105,12 +143,12 @@ jobs:
           EOF
         working-directory: pkg
 
-      - name: Prepare package.json for publishing
+      - name: Prepare package.json for publishing of ${{ env.JS_PKG_NAME }} @ ${{ env.FINAL_VERSION }}
         run: |
           cat pkg/package.json | jq --arg name aquamarine.wasm.base64.js \
             '. + {
               files: [ "aquamarine.wasm.base64.js", "aquamarine.wasm.base64.d.ts",  "index.js", "index.d.ts" ],
-              "name": "@fluencelabs/aquamarine-stepper-${{ env.BRANCH_NAME }}",
+              "name": "${{ env.JS_PKG_NAME }}",
               "description": "Aquamarine IR interpreter as base64 WASM",
               "main": "index.js",
               "repository": "https://github.com/fluencelabs/aquamarine",
@@ -126,10 +164,6 @@ jobs:
 
       - run: cat pkg/package.json
 
-    ### Set default version
-      - run: yarn version --new-version 0.0.0 --no-git-tag-version
-        working-directory: pkg
-
     ### Set version to FINAL_VERSION
       - run: yarn version --new-version ${{ env.FINAL_VERSION }} --no-git-tag-version || true
         working-directory: pkg
@@ -155,8 +189,8 @@ jobs:
 
 
 ### === Rust package release ===
-      - name: Install fcli toml-cli
+      - name: Install fcli
-        run: cargo install fcli toml-cli || true
+        run: cargo install fcli || true
 
       - name: Build aquamarine.wasm for node
         run: fce build -p aquamarine --release --features fce
@@ -165,15 +199,13 @@ jobs:
       - name: Copy aquamarine.wasm to air-interpreter-wasm
         run: cp target/wasm32-wasi/release/aquamarine.wasm crates/air-interpreter-wasm/aquamarine.wasm
 
-      - name: Set project version to ${{ env.FINAL_VERSION }}_${{ env.BRANCH_NAME }}
+      - name: Set project name@version to ${{ env.PKG_NAME }}@${{ env.FINAL_VERSION }}
         run: |
           PATH="~/.cargo/bin:$PATH"
           toml set Cargo.toml package.version "${{ env.FINAL_VERSION }}" | sponge Cargo.toml
 
           NAME=$(toml get Cargo.toml package.name | jq -r .)
-          toml set Cargo.toml package.name "${NAME}_${BRANCH_NAME}" | sponge Cargo.toml
+          toml set Cargo.toml package.name "${{ env.PKG_NAME }}" | sponge Cargo.toml
-
-          cat Cargo.toml
         working-directory: crates/air-interpreter-wasm
 
       - name: Login to crates.io

README.md

@@ -1,3 +1,6 @@
+[![crates.io version](https://img.shields.io/crates/v/air-interpreter-wasm?style=flat-square)](https://crates.io/crates/air-interpreter-wasm)
+[![npm version](https://img.shields.io/npm/v/@fluencelabs/aquamarine-stepper)](https://www.npmjs.com/package/@fluencelabs/aquamarine-stepper)
+
 # Aquamarine
 
  - composability medium