From 4a2014ec8933d3d1325a16b66f8514b17f771d1b Mon Sep 17 00:00:00 2001 From: Anatolios Laskaris Date: Sat, 4 Mar 2023 10:12:24 +0200 Subject: [PATCH] chore: Update E2E after fluence-js refactoring (#63) * Update * Update --- .github/workflows/e2e.yml | 2 +- .github/workflows/tests.yml | 38 ++++++++++++++++++++++--------------- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 7f299da..ace73d8 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -6,7 +6,7 @@ on: - "**.md" push: branches: - - "master" + - "master" concurrency: group: "${{ github.workflow }}-${{ github.ref }}" diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 536cfec..f7377e3 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -11,14 +11,14 @@ on: description: "rust-peer image tag" type: string default: "fluencelabs/fluence:minimal" - fluence-js-version: - description: "@fluencejs/fluence version" - type: string - default: "null" aqua-version: description: "@fluencejs/aqua version" type: string default: "null" + js-client-snapshots: + description: "js-client snapshots" + type: string + default: "null" env: FORCE_COLOR: true @@ -81,12 +81,19 @@ jobs: - run: npm install - - name: Set fluence-js version - if: inputs.fluence-js-version != 'null' + - name: Set js-client.node version + if: inputs.js-client-snapshots != 'null' uses: fluencelabs/github-actions/npm-set-dependency@main with: - package: "@fluencelabs/fluence" - version: ${{ inputs.fluence-js-version }} + package: "@fluencelabs/js-client.node" + version: ${{ fromJson(inputs.js-client-snapshots)['js-client.node'] }} + + - name: Set js-client.api version + if: inputs.js-client-snapshots != 'null' + uses: fluencelabs/github-actions/npm-set-dependency@main + with: + package: "@fluencelabs/js-client.api" + version: ${{ fromJson(inputs.js-client-snapshots)['js-client.api'] }} - name: Set aqua version if: inputs.aqua-version != 'null' @@ -113,13 +120,14 @@ jobs: run: | cat <> $GITHUB_STEP_SUMMARY ## Used versions - | name | version | - | ---------- | -------------------------------------------------------------------- | - | rust-peer | $(docker run --rm --entrypoint=fluence ${RUST_PEER_IMAGE} --version) | - | avm | $(dasel -f package-lock.json -p json -m --plain 'packages.(?:-=node_modules/@fluencelabs/avm).version') | - | marine-js | $(dasel -f package-lock.json -p json -m --plain 'packages.(?:-=node_modules/@fluencelabs/marine-js).version') | - | aqua | $(npx aqua --version) | - | fluence-js | $(dasel -f package-lock.json -p json -m --plain 'packages.(?:-=node_modules/@fluencelabs/fluence).version') | + | name | version | + | -------------- | -------------------------------------------------------------------- | + | rust-peer | $(docker run --rm --entrypoint=fluence ${RUST_PEER_IMAGE} --version) | + | avm | $(dasel -f package-lock.json -p json -m --plain 'packages.(?:-=node_modules/@fluencelabs/avm).version') | + | marine-js | $(dasel -f package-lock.json -p json -m --plain 'packages.(?:-=node_modules/@fluencelabs/marine-js).version') | + | aqua | $(npx aqua --version) | + | js-client.api | $(dasel -f package-lock.json -p json -m --plain 'packages.(?:-=node_modules/@fluencelabs/js-client.api).version') | + | js-cluent.node | $(dasel -f package-lock.json -p json -m --plain 'packages.(?:-=node_modules/@fluencelabs/js-client.node).version') | SNAPSHOT - name: Dump rust-peer logs