From 339be8ff287b8f4b05f29617aeaaad6383cc01b9 Mon Sep 17 00:00:00 2001
From: Anatolios Laskaris <github_me@nahsi.dev>
Date: Mon, 10 Oct 2022 19:09:16 +0300
Subject: [PATCH 1/2] ci: Fix setting version (#192)

* Fix setting version

* Fix
---
 .github/workflows/snapshot.yml | 4 ++--
 .github/workflows/tests.yml    | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
index b78c38c4..e307af48 100644
--- a/.github/workflows/snapshot.yml
+++ b/.github/workflows/snapshot.yml
@@ -50,7 +50,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 add --save @fluencelabs/avm@${{ inputs.avm-version }}
 
       - run: pnpm -r build
 
@@ -109,5 +109,5 @@ jobs:
             To install it run:
             ```shell
             npm login --registry https://npm.fluence.dev
-            npm i @fluencelabs/fluence@${{ env.FLUENCE_JS_VERSION }} --registry=https://npm.fluence.dev
+            npm i @fluencelabs/fluence@=${{ env.FLUENCE_JS_VERSION }} --registry=https://npm.fluence.dev
             ```
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index e2b6c054..ca3bece6 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -83,11 +83,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 add @fluencelabs/avm@${{ inputs.avm-version }}
+        run: pnpm add --save @fluencelabs/avm@${{ inputs.avm-version }}
 
-      - run: pnpm i
       - run: pnpm -r build
       - run: pnpm -r test

From b160fb7edc61e03e8087db4e9432b6fc41884cbd Mon Sep 17 00:00:00 2001
From: Anatolios Laskaris <github_me@nahsi.dev>
Date: Mon, 10 Oct 2022 21:03:03 +0300
Subject: [PATCH 2/2] ci: Add registry to e2e (#193)

* Add registry tests

* Fix
---
 .github/workflows/run-tests.yml | 14 +++++++++++---
 .github/workflows/snapshot.yml  |  4 ++--
 .github/workflows/tests.yml     |  2 +-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index c2a27982..e3e24f11 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -24,7 +24,7 @@ jobs:
 
     uses: fluencelabs/aqua/.github/workflows/snapshot.yml@main
     with:
-      fluence-js-version: ${{ needs.snapshot.outputs.fluence-js-version }}
+      fluence-js-version: "=${{ needs.snapshot.outputs.fluence-js-version }}"
 
   aqua-playground:
     needs:
@@ -33,5 +33,13 @@ jobs:
 
     uses: fluencelabs/aqua-playground/.github/workflows/tests.yml@master
     with:
-      fluence-js-version: ${{ needs.snapshot.outputs.fluence-js-version }}
-      aqua-version: ${{ needs.aqua-snapshot.outputs.aqua-version }}
+      fluence-js-version: "=${{ needs.snapshot.outputs.fluence-js-version }}"
+      aqua-version: "=${{ needs.aqua-snapshot.outputs.aqua-version }}"
+
+  registry:
+    needs:
+      - aqua-snapshot
+
+    uses: fluencelabs/registry/.github/workflows/tests.yml@main
+    with:
+      aqua-version: "=${{ needs.aqua-snapshot.outputs.aqua-version }}"
diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
index e307af48..e9653bfc 100644
--- a/.github/workflows/snapshot.yml
+++ b/.github/workflows/snapshot.yml
@@ -50,7 +50,7 @@ jobs:
       - name: Set avm version from branch
         if: inputs.avm-version != ''
         working-directory: packages/fluence-js
-        run: pnpm add --save @fluencelabs/avm@${{ inputs.avm-version }}
+        run: pnpm add --save -E @fluencelabs/avm@${{ inputs.avm-version }}
 
       - run: pnpm -r build
 
@@ -109,5 +109,5 @@ jobs:
             To install it run:
             ```shell
             npm login --registry https://npm.fluence.dev
-            npm i @fluencelabs/fluence@=${{ env.FLUENCE_JS_VERSION }} --registry=https://npm.fluence.dev
+            npm i -E @fluencelabs/fluence@${{ env.FLUENCE_JS_VERSION }} --registry=https://npm.fluence.dev
             ```
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index ca3bece6..525d4d96 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -88,7 +88,7 @@ jobs:
       - name: Set avm version from branch
         if: inputs.avm-version != ''
         working-directory: packages/fluence-js
-        run: pnpm add --save @fluencelabs/avm@${{ inputs.avm-version }}
+        run: pnpm add --save -E @fluencelabs/avm@${{ inputs.avm-version }}
 
       - run: pnpm -r build
       - run: pnpm -r test