From 73bce39621dc9515176f02859db1083b3bb9c58c Mon Sep 17 00:00:00 2001
From: Anatoly Laskaris <github_me@nahsi.dev>
Date: Tue, 13 Sep 2022 19:24:20 +0300
Subject: [PATCH] chore: Prepare for Aquavm/aqua E2E (#182)

* Prepare for aquavm e2e

* Checkout to fluence-js repo

* Updates

* Use cache

* Fix setting up node version
---
 .github/workflows/run-tests.yml |  2 --
 .github/workflows/snapshot.yml  | 16 ++++++++++++++--
 .github/workflows/tests.yml     | 16 +++++++++++-----
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index a4f6abea..527c36e5 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 1cefe593..4e20840b 100644
--- a/.github/workflows/snapshot.yml
+++ b/.github/workflows/snapshot.yml
@@ -2,9 +2,13 @@ name: Publish snapshot
 
 on:
   workflow_call:
+    inputs:
+      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:
@@ -26,16 +30,24 @@ jobs:
     steps:
       - name: Checkout fluence-js
         uses: actions/checkout@v3
+        with:
+          repository: fluencelabs/fluence-js
 
       - uses: pnpm/action-setup@v2.2.2
         with:
           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"
+
+      - 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
       - run: pnpm -r build
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 8a4bc9d8..e2b6c054 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -7,9 +7,9 @@ on:
         description: "rust-peer image tag"
         type: string
         default: "fluencelabs/fluence:minimal"
-      ref:
+      avm-version:
+        description: "@fluencelabs/avm version"
         type: string
-        default: "master"
 
 env:
   RUST_PEER_IMAGE: "${{ inputs.rust-peer-image }}"
@@ -56,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
@@ -77,10 +76,17 @@ jobs:
         with:
           version: 7
 
-      - name: Setup Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
+      - name: Setup node ${{ matrix.node-version }} with self-hosted registry
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
+          registry-url: "https://npm.fluence.dev"
+          cache: "pnpm"
+
+      - 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
       - run: pnpm -r build