From 5e6b8ac52b53edaa3e7ee5f862b7e31a5d844c5a Mon Sep 17 00:00:00 2001 From: Anatoly Laskaris Date: Tue, 13 Sep 2022 13:39:49 +0300 Subject: [PATCH 01/10] Prepare for aquavm e2e --- .github/workflows/snapshot.yml | 13 ++++++++++++- .github/workflows/tests.yml | 19 ++++++++++++++++++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 1cefe593e..e0a0c73d1 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -2,6 +2,10 @@ name: Publish snapshot on: workflow_call: + inputs: + avm-version: + description: "avm version" + type: string outputs: fluence-js-version: description: "FluenceJS snapshot version" @@ -32,12 +36,19 @@ jobs: version: 7 - name: Setup node with self-hosted npm registry - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: node-version: "16" registry-url: "https://npm.fluence.dev" + cache: "pnpm" - run: pnpm i + + - name: Set avm version from branch + if: inputs.avm-version != '' + working-directory: packages/fluence-js + run: npm i @fluencelabs/avm@${{ inputs.avm-version }} + - run: pnpm -r build - name: Import secrets diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8a4bc9d8c..f0f52de3c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -7,6 +7,9 @@ on: description: "rust-peer image tag" type: string default: "fluencelabs/fluence:minimal" + avm-version: + description: "avm version" + type: string ref: type: string default: "master" @@ -78,10 +81,24 @@ jobs: version: 7 - name: Setup Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 + uses: actions/setup-node@v3 with: node-version: ${{ matrix.node-version }} + cache: pnpm - run: pnpm i + + - name: Setup node with self-hosted registry + if: inputs.avm-version != '' + uses: actions/setup-node@v3 + with: + node-version: "16" + registry-url: "https://npm.fluence.dev" + + - name: Set avm version from branch + if: inputs.avm-version != '' + working-directory: packages/fluence-js + run: npm i @fluencelabs/avm@${{ inputs.avm-version }} + - run: pnpm -r build - run: pnpm -r test From ee8a879274e2bde310f5314c68e4dc20481c96e5 Mon Sep 17 00:00:00 2001 From: Anatoly Laskaris Date: Tue, 13 Sep 2022 13:51:26 +0300 Subject: [PATCH 02/10] Checkout to fluence-js repo --- .github/workflows/snapshot.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index e0a0c73d1..23ab3d88c 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -30,6 +30,7 @@ jobs: steps: - name: Checkout fluence-js uses: actions/checkout@v3 + repository: fluencelabs/fluence-js - uses: pnpm/action-setup@v2.2.2 with: From 2dff9ac534885982ec40f9ac444854563d821591 Mon Sep 17 00:00:00 2001 From: Anatoly Laskaris Date: Tue, 13 Sep 2022 13:53:14 +0300 Subject: [PATCH 03/10] Fix --- .github/workflows/snapshot.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 23ab3d88c..c2f17ff51 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -30,7 +30,8 @@ jobs: steps: - name: Checkout fluence-js uses: actions/checkout@v3 - repository: fluencelabs/fluence-js + with: + repository: fluencelabs/fluence-js - uses: pnpm/action-setup@v2.2.2 with: From 2fbb8436e79d94a90b284e05c12eaba0483c0800 Mon Sep 17 00:00:00 2001 From: Anatoly Laskaris Date: Tue, 13 Sep 2022 14:07:19 +0300 Subject: [PATCH 04/10] Fix --- .github/workflows/snapshot.yml | 2 +- .github/workflows/tests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index c2f17ff51..b0f48d183 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -49,7 +49,7 @@ jobs: - name: Set avm version from branch if: inputs.avm-version != '' working-directory: packages/fluence-js - run: npm i @fluencelabs/avm@${{ inputs.avm-version }} + run: pnpm i @fluencelabs/avm@${{ inputs.avm-version }} - run: pnpm -r build diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f0f52de3c..5189b8769 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -98,7 +98,7 @@ jobs: - name: Set avm version from branch if: inputs.avm-version != '' working-directory: packages/fluence-js - run: npm i @fluencelabs/avm@${{ inputs.avm-version }} + run: pnpm i @fluencelabs/avm@${{ inputs.avm-version }} - run: pnpm -r build - run: pnpm -r test From 6a1b4729e9592c6448f61cf2c5fc8f45a9d5f3e2 Mon Sep 17 00:00:00 2001 From: Anatoly Laskaris Date: Tue, 13 Sep 2022 14:08:03 +0300 Subject: [PATCH 05/10] Fix --- .github/workflows/snapshot.yml | 2 +- .github/workflows/tests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index b0f48d183..f7d3af0a8 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -49,7 +49,7 @@ jobs: - name: Set avm version from branch if: inputs.avm-version != '' working-directory: packages/fluence-js - run: pnpm i @fluencelabs/avm@${{ inputs.avm-version }} + run: pnpm add @fluencelabs/avm@${{ inputs.avm-version }} - run: pnpm -r build diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5189b8769..981725174 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -98,7 +98,7 @@ jobs: - name: Set avm version from branch if: inputs.avm-version != '' working-directory: packages/fluence-js - run: pnpm i @fluencelabs/avm@${{ inputs.avm-version }} + run: pnpm add @fluencelabs/avm@${{ inputs.avm-version }} - run: pnpm -r build - run: pnpm -r test From 688e5f446030ff0805bc114c1a49f8a1a190c520 Mon Sep 17 00:00:00 2001 From: Anatoly Laskaris Date: Tue, 13 Sep 2022 14:12:18 +0300 Subject: [PATCH 06/10] Run install --- .github/workflows/snapshot.yml | 2 +- .github/workflows/tests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index f7d3af0a8..b0f48d183 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -49,7 +49,7 @@ jobs: - name: Set avm version from branch if: inputs.avm-version != '' working-directory: packages/fluence-js - run: pnpm add @fluencelabs/avm@${{ inputs.avm-version }} + run: pnpm i @fluencelabs/avm@${{ inputs.avm-version }} - run: pnpm -r build diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 981725174..5189b8769 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -98,7 +98,7 @@ jobs: - name: Set avm version from branch if: inputs.avm-version != '' working-directory: packages/fluence-js - run: pnpm add @fluencelabs/avm@${{ inputs.avm-version }} + run: pnpm i @fluencelabs/avm@${{ inputs.avm-version }} - run: pnpm -r build - run: pnpm -r test From 660cae1c0b75e6443c0a030c7aa4e877909f2efe Mon Sep 17 00:00:00 2001 From: Anatoly Laskaris Date: Tue, 13 Sep 2022 14:17:19 +0300 Subject: [PATCH 07/10] Fix --- .github/workflows/snapshot.yml | 5 ++--- .github/workflows/tests.yml | 13 +++---------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index b0f48d183..acc425d31 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -44,13 +44,12 @@ jobs: registry-url: "https://npm.fluence.dev" cache: "pnpm" - - run: pnpm i - - name: Set avm version from branch if: inputs.avm-version != '' working-directory: packages/fluence-js - run: pnpm i @fluencelabs/avm@${{ inputs.avm-version }} + run: pnpm add @fluencelabs/avm@${{ inputs.avm-version }} + - run: pnpm i - run: pnpm -r build - name: Import secrets diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5189b8769..d9d8c3022 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -80,16 +80,7 @@ jobs: with: version: 7 - - name: Setup Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 - with: - node-version: ${{ matrix.node-version }} - cache: pnpm - - - run: pnpm i - - name: Setup node with self-hosted registry - if: inputs.avm-version != '' uses: actions/setup-node@v3 with: node-version: "16" @@ -98,7 +89,9 @@ jobs: - name: Set avm version from branch if: inputs.avm-version != '' working-directory: packages/fluence-js - run: pnpm i @fluencelabs/avm@${{ inputs.avm-version }} + run: pnpm add @fluencelabs/avm@${{ inputs.avm-version }} + + - run: pnpm i - run: pnpm -r build - run: pnpm -r test From b1a1f158b7b659a5afa0e90bf60d86d32f4d6d5b Mon Sep 17 00:00:00 2001 From: Anatoly Laskaris Date: Tue, 13 Sep 2022 16:16:05 +0300 Subject: [PATCH 08/10] Updates --- .github/workflows/run-tests.yml | 2 -- .github/workflows/snapshot.yml | 4 ++-- .github/workflows/tests.yml | 7 +------ 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index a4f6abea8..527c36e50 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -12,8 +12,6 @@ concurrency: jobs: fluence-js: uses: ./.github/workflows/tests.yml - with: - ref: ${{ github.ref }} snapshot: uses: ./.github/workflows/snapshot.yml diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index acc425d31..4e20840b9 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -4,11 +4,11 @@ on: workflow_call: inputs: avm-version: - description: "avm version" + description: "@fluencelabs/avm version" type: string outputs: fluence-js-version: - description: "FluenceJS snapshot version" + description: "@fluencelabs/fluence version" value: ${{ jobs.publish-snapshot.outputs.fluence-js-version }} env: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d9d8c3022..b423020df 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -8,11 +8,8 @@ on: type: string default: "fluencelabs/fluence:minimal" avm-version: - description: "avm version" + description: "@fluencelabs/avm version" type: string - ref: - type: string - default: "master" env: RUST_PEER_IMAGE: "${{ inputs.rust-peer-image }}" @@ -59,7 +56,6 @@ jobs: uses: actions/checkout@v3 with: repository: fluencelabs/fluence-js - ref: ${{ inputs.ref }} - name: Setup docker-compose uses: KengoTODA/actions-setup-docker-compose@v1.0.9 @@ -91,7 +87,6 @@ jobs: working-directory: packages/fluence-js run: pnpm add @fluencelabs/avm@${{ inputs.avm-version }} - - run: pnpm i - run: pnpm -r build - run: pnpm -r test From 7079aee07d190debacc568f33507b5e370eaffb3 Mon Sep 17 00:00:00 2001 From: Anatoly Laskaris Date: Tue, 13 Sep 2022 16:20:42 +0300 Subject: [PATCH 09/10] Use cache --- .github/workflows/tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b423020df..86cf60e3f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -81,6 +81,7 @@ jobs: with: node-version: "16" registry-url: "https://npm.fluence.dev" + cache: "pnpm" - name: Set avm version from branch if: inputs.avm-version != '' From 8e7ca07a105cdd268c236b53fbf4405f92143b30 Mon Sep 17 00:00:00 2001 From: Anatoly Laskaris Date: Tue, 13 Sep 2022 16:26:13 +0300 Subject: [PATCH 10/10] Fix setting up node version --- .github/workflows/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 86cf60e3f..e2b6c054b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -76,10 +76,10 @@ jobs: with: version: 7 - - name: Setup node with self-hosted registry + - name: Setup node ${{ matrix.node-version }} with self-hosted registry uses: actions/setup-node@v3 with: - node-version: "16" + node-version: ${{ matrix.node-version }} registry-url: "https://npm.fluence.dev" cache: "pnpm"