From f02905da2397e551e224197803b976a1ae36cae8 Mon Sep 17 00:00:00 2001 From: Anatoly Laskaris Date: Tue, 22 Nov 2022 17:07:23 +0200 Subject: [PATCH 1/3] Add marine-js --- .github/workflows/snapshot.yml | 11 +++++++++++ .github/workflows/tests.yml | 8 ++++++++ 2 files changed, 19 insertions(+) diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 0d3b2c263..a52b1071f 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -6,6 +6,9 @@ on: avm-version: description: "@fluencelabs/avm version" type: string + marine-js-version: + description: "@fluencelabs/marine-js version" + type: string outputs: fluence-js-version: description: "@fluencelabs/fluence version" @@ -54,6 +57,14 @@ jobs: version: ${{ inputs.avm-version }} working-directory: packages/fluence-js + - name: Set marine-js version + if: inputs.marine-js-version != '' + uses: fluencelabs/github-actions/npm-set-dependency@main + with: + package: "@fluencelabs/marine-js" + version: ${{ inputs.marine-js-version }} + working-directory: packages/fluence-js + - name: Import secrets uses: hashicorp/vault-action@v2.4.3 with: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6ceadd4fa..f84a7b523 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -88,5 +88,13 @@ jobs: version: ${{ inputs.avm-version }} working-directory: packages/fluence-js + - name: Set marine-js version + if: inputs.marine-js-version != '' + uses: fluencelabs/github-actions/npm-set-dependency@main + with: + package: "@fluencelabs/marine-js" + version: ${{ inputs.marine-js-version }} + working-directory: packages/fluence-js + - run: pnpm -r build - run: pnpm -r test From 680e41cce3f1bf09da84318e2ca5c6376d71f38c Mon Sep 17 00:00:00 2001 From: Anatoly Laskaris Date: Tue, 22 Nov 2022 17:36:02 +0200 Subject: [PATCH 2/3] Add marine-js input --- .github/workflows/tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f84a7b523..0df1c6357 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -10,6 +10,9 @@ on: avm-version: description: "@fluencelabs/avm version" type: string + marine-js-version: + description: "@fluencelabs/marine-js version" + type: string env: RUST_PEER_IMAGE: "${{ inputs.rust-peer-image }}" From 49b5aa8295683b533d54c71e7ff9e6a190c9f2ef Mon Sep 17 00:00:00 2001 From: Anatoly Laskaris Date: Tue, 22 Nov 2022 17:47:07 +0200 Subject: [PATCH 3/3] Fix --- .github/workflows/snapshot.yml | 14 ++++---------- .github/workflows/tests.yml | 14 ++++---------- 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index a52b1071f..f6dbe3291 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -51,19 +51,13 @@ jobs: - name: Set avm version if: inputs.avm-version != '' - uses: fluencelabs/github-actions/npm-set-dependency@main - with: - package: "@fluencelabs/avm" - version: ${{ inputs.avm-version }} - working-directory: packages/fluence-js + working-directory: packages/fluence-js + run: pnpm i --save -E @fluencelabs/avm@${{ inputs.avm-version }} - name: Set marine-js version if: inputs.marine-js-version != '' - uses: fluencelabs/github-actions/npm-set-dependency@main - with: - package: "@fluencelabs/marine-js" - version: ${{ inputs.marine-js-version }} - working-directory: packages/fluence-js + working-directory: packages/fluence-js + run: pnpm i --save -E @fluencelabs/marine-js@${{ inputs.marine-js-version }} - name: Import secrets uses: hashicorp/vault-action@v2.4.3 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0df1c6357..e3ec825cc 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -85,19 +85,13 @@ jobs: - name: Set avm version if: inputs.avm-version != '' - uses: fluencelabs/github-actions/npm-set-dependency@main - with: - package: "@fluencelabs/avm" - version: ${{ inputs.avm-version }} - working-directory: packages/fluence-js + working-directory: packages/fluence-js + run: pnpm i --save -E @fluencelabs/avm@${{ inputs.avm-version }} - name: Set marine-js version if: inputs.marine-js-version != '' - uses: fluencelabs/github-actions/npm-set-dependency@main - with: - package: "@fluencelabs/marine-js" - version: ${{ inputs.marine-js-version }} - working-directory: packages/fluence-js + working-directory: packages/fluence-js + run: pnpm i --save -E @fluencelabs/marine-js@${{ inputs.marine-js-version }} - run: pnpm -r build - run: pnpm -r test