From a216d5458658d4a4166fdf12c3685a881d98de1b Mon Sep 17 00:00:00 2001
From: Anatoly Laskaris <github_me@nahsi.dev>
Date: Tue, 22 Nov 2022 14:49:44 +0200
Subject: [PATCH 1/8] Test

---
 .github/workflows/{run-tests.yml => e2e.yml} | 21 ++++----
 .github/workflows/snapshot.yml               | 51 ++++++--------------
 .github/workflows/tests.yml                  | 16 +++---
 3 files changed, 35 insertions(+), 53 deletions(-)
 rename .github/workflows/{run-tests.yml => e2e.yml} (62%)

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/e2e.yml
similarity index 62%
rename from .github/workflows/run-tests.yml
rename to .github/workflows/e2e.yml
index e3e24f117..45d162e17 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/e2e.yml
@@ -1,40 +1,43 @@
-name: Run tests
+name: "e2e"
 
 on:
   pull_request:
     paths-ignore:
       - "**.md"
+  push:
+    branches:
+      - "master"
 
 concurrency:
   group: "${{ github.workflow }}-${{ github.ref }}"
   cancel-in-progress: true
 
 jobs:
-  fluence-js:
+  tests:
     uses: ./.github/workflows/tests.yml
 
-  snapshot:
+  fluence-js:
     name: "fluence-js"
     uses: ./.github/workflows/snapshot.yml
 
   aqua-snapshot:
     name: "aqua"
     needs:
-      - snapshot
+      - fluence-js
 
     uses: fluencelabs/aqua/.github/workflows/snapshot.yml@main
     with:
-      fluence-js-version: "=${{ needs.snapshot.outputs.fluence-js-version }}"
+      fluence-js-version: "${{ needs.fluence-js.outputs.fluence-js-version }}"
 
   aqua-playground:
     needs:
-      - snapshot
+      - fluence-js
       - aqua-snapshot
 
     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.fluence-js.outputs.fluence-js-version }}"
+      aqua-version: "${{ needs.aqua-snapshot.outputs.aqua-version }}"
 
   registry:
     needs:
@@ -42,4 +45,4 @@ jobs:
 
     uses: fluencelabs/registry/.github/workflows/tests.yml@main
     with:
-      aqua-version: "=${{ needs.aqua-snapshot.outputs.aqua-version }}"
+      aqua-version: "${{ needs.aqua-snapshot.outputs.aqua-version }}"
diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
index 3dda2d578..ad141fa6a 100644
--- a/.github/workflows/snapshot.yml
+++ b/.github/workflows/snapshot.yml
@@ -47,15 +47,16 @@ jobs:
 
       - run: pnpm i
 
-      - name: Set avm version from branch
+      - name: Set avm version
         if: inputs.avm-version != ''
-        working-directory: packages/fluence-js
-        run: pnpm add --save -E @fluencelabs/avm@${{ inputs.avm-version }}
-
-      - run: pnpm -r build
+        uses: fluencelabs/github-actions/npm-set-dependency@FLU-118-add-npm-set-dependency
+        with:
+          package: "@fluencelabs/avm"
+          version: ${{ inputs.avm-version }}
+          working-directory: packages/fluence-js
 
       - name: Import secrets
-        uses: hashicorp/vault-action@v2.4.2
+        uses: hashicorp/vault-action@v2.4.3
         with:
           url: https://vault.fluence.dev
           path: jwt/github
@@ -67,35 +68,15 @@ jobs:
           secrets: |
             kv/npm-registry/basicauth/ci token | NODE_AUTH_TOKEN
 
-      - name: Generate package version
+      - name: Generate snapshot version
         id: version
-        run: |
-          SHA=${{ github.event.pull_request.head.sha }}
-          echo "sha=${SHA::7}" >> $GITHUB_OUTPUT
-          echo "branch=${GITHUB_HEAD_REF//[^a-zA-Z0-9-]/-}" >> $GITHUB_OUTPUT
+        uses: fluencelabs/github-actions/generate-snapshot-id@main
 
-      - name: Set package version
-        id: build
-        env:
-          BRANCH: ${{ steps.version.outputs.branch }}
-          SHA: ${{ steps.version.outputs.sha }}
-          RUN: ${{ github.run_number }}
-          ATTEMPT: ${{ github.run_attempt }}
-        run: |
-          node ci.js bump-version ${{ env.BRANCH }}-${{ env.SHA }}-${{ env.RUN }}-${{ env.ATTEMPT }}
-          echo "version=$(node ci.js get-version)" >> $GITHUB_OUTPUT
-
-      - name: Publish to self-hosted npm repo
-        run: pnpm --no-git-checks --registry https://npm.fluence.dev -r publish --tag e2e -filter '@fluencelabs/*'
+      - run: pnpm -r build
 
-      - name: Print versions to check summary
-        env:
-          VERSION: ${{ steps.build.outputs.version }}
-        run: |
-          cat <<'SNAPSHOT' >> $GITHUB_STEP_SUMMARY
-          ## FluenceJS version is [${{ env.VERSION }}](https://npm.fluence.dev/-/web/detail/@fluencelabs/fluence/v/${{ env.VERSION }})
-          To use it run:
-          ```shell
-          npm i -E @fluencelabs/fluence@${{ env.VERSION }} --registry=https://npm.fluence.dev
-          ```
-          SNAPSHOT
+      - name: Publish snapshot
+        id: snapshot
+        uses: fluencelabs/github-actions/npm-publish-snapshot@main
+        with:
+          working-directory: packages/fluence-js
+          id: ${{ steps.version.outputs.id }}
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 525d4d968..e16373532 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -33,7 +33,7 @@ jobs:
 
     steps:
       - name: Import secrets
-        uses: hashicorp/vault-action@v2.4.1
+        uses: hashicorp/vault-action@v2.4.3
         with:
           url: https://vault.fluence.dev
           path: jwt/github
@@ -57,11 +57,6 @@ jobs:
         with:
           repository: fluencelabs/fluence-js
 
-      - name: Setup docker-compose
-        uses: KengoTODA/actions-setup-docker-compose@v1.0.9
-        with:
-          version: 'v2.10.0'
-
       - name: Pull rust-peer image
         run: docker pull $RUST_PEER_IMAGE
 
@@ -85,10 +80,13 @@ jobs:
 
       - run: pnpm i
 
-      - name: Set avm version from branch
+      - name: Set avm version
         if: inputs.avm-version != ''
-        working-directory: packages/fluence-js
-        run: pnpm add --save -E @fluencelabs/avm@${{ inputs.avm-version }}
+        uses: fluencelabs/github-actions/npm-set-dependency@FLU-118-add-npm-set-dependency
+        with:
+          package: "@fluencelabs/avm"
+          version: ${{ inputs.avm-version }}
+          working-directory: packages/fluence-js
 
       - run: pnpm -r build
       - run: pnpm -r test

From 6645410e0eeab3c18d45b9dcfdd5cddf2eaf5b97 Mon Sep 17 00:00:00 2001
From: Anatoly Laskaris <github_me@nahsi.dev>
Date: Tue, 22 Nov 2022 14:56:40 +0200
Subject: [PATCH 2/8] Fix

---
 .github/workflows/e2e.yml      | 4 +---
 .github/workflows/snapshot.yml | 3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 45d162e17..e700a4f42 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -17,11 +17,9 @@ jobs:
     uses: ./.github/workflows/tests.yml
 
   fluence-js:
-    name: "fluence-js"
     uses: ./.github/workflows/snapshot.yml
 
-  aqua-snapshot:
-    name: "aqua"
+  aqua:
     needs:
       - fluence-js
 
diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
index ad141fa6a..5cf65c473 100644
--- a/.github/workflows/snapshot.yml
+++ b/.github/workflows/snapshot.yml
@@ -21,11 +21,10 @@ jobs:
     runs-on: ubuntu-latest
 
     outputs:
-      fluence-js-version: "${{ steps.build.outputs.version }}"
+      fluence-js-version: "${{ steps.snapshot.outputs.version }}"
 
     permissions:
       contents: read
-      pull-requests: write
       id-token: write
 
     steps:

From fc61efc742447914a5c2363cd9603833b1523deb Mon Sep 17 00:00:00 2001
From: Anatoly Laskaris <github_me@nahsi.dev>
Date: Tue, 22 Nov 2022 14:58:00 +0200
Subject: [PATCH 3/8] Fix

---
 .github/workflows/e2e.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index e700a4f42..6b73c22c5 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -30,17 +30,17 @@ jobs:
   aqua-playground:
     needs:
       - fluence-js
-      - aqua-snapshot
+      - aqua
 
     uses: fluencelabs/aqua-playground/.github/workflows/tests.yml@master
     with:
       fluence-js-version: "${{ needs.fluence-js.outputs.fluence-js-version }}"
-      aqua-version: "${{ needs.aqua-snapshot.outputs.aqua-version }}"
+      aqua-version: "${{ needs.aqua.outputs.aqua-version }}"
 
   registry:
     needs:
-      - aqua-snapshot
+      - aqua
 
     uses: fluencelabs/registry/.github/workflows/tests.yml@main
     with:
-      aqua-version: "${{ needs.aqua-snapshot.outputs.aqua-version }}"
+      aqua-version: "${{ needs.aqua.outputs.aqua-version }}"

From 9f76335f49943f4f4b825aad391057b8601970e8 Mon Sep 17 00:00:00 2001
From: Anatoly Laskaris <github_me@nahsi.dev>
Date: Tue, 22 Nov 2022 15:00:12 +0200
Subject: [PATCH 4/8] Fix name

---
 .github/workflows/e2e.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 6b73c22c5..d9ba6da68 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -14,6 +14,7 @@ concurrency:
 
 jobs:
   tests:
+    name: "fluence-js"
     uses: ./.github/workflows/tests.yml
 
   fluence-js:

From 496d417673816c626c7a928e46e3897d850780be Mon Sep 17 00:00:00 2001
From: Anatoly Laskaris <github_me@nahsi.dev>
Date: Tue, 22 Nov 2022 15:08:43 +0200
Subject: [PATCH 5/8] Update

---
 .github/workflows/snapshot.yml | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
index 5cf65c473..c4646e06c 100644
--- a/.github/workflows/snapshot.yml
+++ b/.github/workflows/snapshot.yml
@@ -71,11 +71,22 @@ jobs:
         id: version
         uses: fluencelabs/github-actions/generate-snapshot-id@main
 
+      - name: Set package version
+        id: snapshot
+        run: |
+          node ci.js bump-version ${{ steps.version.outputs.id }}
+          echo "version=$(node ci.js get-version)" >> $GITHUB_OUTPUT
+
       - run: pnpm -r build
 
-      - name: Publish snapshot
-        id: snapshot
+      - name: Publish to self-hosted npm repo
+        run: |
+          # Publish to self-hosted npm repo
+          pnpm --no-git-checks --registry https://npm.fluence.dev -r publish --tag snapshot -filter '@fluencelabs/*'
+
+      - name: Print info to check summary
         uses: fluencelabs/github-actions/npm-publish-snapshot@main
         with:
           working-directory: packages/fluence-js
           id: ${{ steps.version.outputs.id }}
+          publish: false

From bb0e6123286e8cdacdaa9d0ef39139e638a5f854 Mon Sep 17 00:00:00 2001
From: Anatoly Laskaris <github_me@nahsi.dev>
Date: Tue, 22 Nov 2022 15:13:23 +0200
Subject: [PATCH 6/8] Update actions

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

diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
index c4646e06c..0f66c4db8 100644
--- a/.github/workflows/snapshot.yml
+++ b/.github/workflows/snapshot.yml
@@ -33,7 +33,7 @@ jobs:
         with:
           repository: fluencelabs/fluence-js
 
-      - uses: pnpm/action-setup@v2.2.2
+      - uses: pnpm/action-setup@v2.2.4
         with:
           version: 7
 
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index e16373532..1bfaaec83 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -61,13 +61,13 @@ jobs:
         run: docker pull $RUST_PEER_IMAGE
 
       - name: Run rust-peer
-        uses: isbang/compose-action@v1.1.0
+        uses: isbang/compose-action@v1.4.1
         with:
           compose-file: ".github/e2e/docker-compose.yml"
           down-flags: "--volumes"
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v2.2.2
+        uses: pnpm/action-setup@v2.2.4
         with:
           version: 7
 

From ccd8ce7103a2e6a88deddc8ba0ca09e5c013fbf9 Mon Sep 17 00:00:00 2001
From: Anatoly Laskaris <github_me@nahsi.dev>
Date: Tue, 22 Nov 2022 15:22:37 +0200
Subject: [PATCH 7/8] Use main branch

---
 .github/workflows/snapshot.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
index 0f66c4db8..0d3b2c263 100644
--- a/.github/workflows/snapshot.yml
+++ b/.github/workflows/snapshot.yml
@@ -48,7 +48,7 @@ jobs:
 
       - name: Set avm version
         if: inputs.avm-version != ''
-        uses: fluencelabs/github-actions/npm-set-dependency@FLU-118-add-npm-set-dependency
+        uses: fluencelabs/github-actions/npm-set-dependency@main
         with:
           package: "@fluencelabs/avm"
           version: ${{ inputs.avm-version }}

From 51d8bf7f00aea7b78b6b1ee4f4aa6e6ccdb4cf08 Mon Sep 17 00:00:00 2001
From: Anatoly Laskaris <github_me@nahsi.dev>
Date: Tue, 22 Nov 2022 15:30:12 +0200
Subject: [PATCH 8/8] Fix

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 1bfaaec83..6ceadd4fa 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -82,7 +82,7 @@ jobs:
 
       - name: Set avm version
         if: inputs.avm-version != ''
-        uses: fluencelabs/github-actions/npm-set-dependency@FLU-118-add-npm-set-dependency
+        uses: fluencelabs/github-actions/npm-set-dependency@main
         with:
           package: "@fluencelabs/avm"
           version: ${{ inputs.avm-version }}