From 0cef4b846b3c1ad70d4ab74cbd80189641c8a2c5 Mon Sep 17 00:00:00 2001
From: AArdian <34317628+arddluma@users.noreply.github.com>
Date: Mon, 17 Jun 2024 12:55:49 +0200
Subject: [PATCH] (v2) fix: release tagging (#204) [skip ci]

---
 .github/workflows/release-dev.yml | 13 ++++++-------
 .github/workflows/release.yml     |  9 ++++-----
 README.md                         |  5 +++++
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/release-dev.yml b/.github/workflows/release-dev.yml
index 8984bb71..00be4fbd 100644
--- a/.github/workflows/release-dev.yml
+++ b/.github/workflows/release-dev.yml
@@ -1,4 +1,4 @@
-name: Build skandha unstable docker image 
+name: Build skandha v2 docker image 
 
 on:
   push:
@@ -24,7 +24,7 @@ jobs:
       - 
         name: Get package version
         id: get_version
-        run: echo version=$(git rev-parse --short "$GITHUB_SHA") >> $GITHUB_OUTPUT
+        run: echo version=$(node -p "require('./package.json').version") >> $GITHUB_OUTPUT
 
       - run: echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} > .npmrc
         env:
@@ -43,16 +43,15 @@ jobs:
           file: ./Dockerfile
           push: true
           tags: |
-            ${{ secrets.DOCKERHUB_USERNAME }}/skandha:unstable
-            ${{ secrets.DOCKERHUB_USERNAME }}/skandha:unstable-${{ steps.get_version.outputs.version }}
+            ${{ secrets.DOCKERHUB_USERNAME }}/skandha:v2-${{ steps.get_version.outputs.version }}
       -
         name: Create GitHub release
         uses: "marvinpinto/action-automatic-releases@6273874b61ebc8c71f1a61b2d98e234cf389b303"
         with:
           repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          automatic_release_tag: "unstable"
-          prerelease: true
-          title: Release unstable-${{ steps.get_version.outputs.version }}
+          automatic_release_tag: v2-${{ steps.get_version.outputs.version }}
+          prerelease: false
+          title: Release v2-${{ steps.get_version.outputs.version }}
       - 
         name: Trigger dev pipeline
         run: ${{ secrets.PIPELINE_DEV_TRIGGER  }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d9f6556c..354730c1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,4 +1,4 @@
-name: Build skandha docker image 
+name: Build skandha v1 docker image 
 
 on:
   push:
@@ -38,16 +38,15 @@ jobs:
           file: ./Dockerfile
           push: true
           tags: |
-            ${{ secrets.DOCKERHUB_USERNAME }}/skandha:${{ steps.get_version.outputs.version }}
-            ${{ secrets.DOCKERHUB_USERNAME }}/skandha:latest
+            ${{ secrets.DOCKERHUB_USERNAME }}/skandha:v1-${{ steps.get_version.outputs.version }}
       -
         name: Create GitHub release
         uses: "marvinpinto/action-automatic-releases@6273874b61ebc8c71f1a61b2d98e234cf389b303"
         with:
           repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          automatic_release_tag: ${{ steps.get_version.outputs.version }}
+          automatic_release_tag: v1-${{ steps.get_version.outputs.version }}
           prerelease: false
-          title: Release ${{ steps.get_version.outputs.version }}
+          title: Release v1-${{ steps.get_version.outputs.version }}
       - 
         name: Trigger pipeline
         run: ${{ secrets.PIPELINE_TRIGGER  }}
diff --git a/README.md b/README.md
index 4531f5a3..20d4413d 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,11 @@
    </p>
 </div>
 
+> [!IMPORTANT]
+> **Skandha v1** - supports EntryPoint 0.6.0 and can be found on [master](https://github.com/etherspot/skandha/tree/master)
+> 
+> **Skandha v2** - supports EntryPoint 0.7.0 and can be found on [develop](https://github.com/etherspot/skandha/tree/develop)
+
 ## Important links
 
 **[Install Skandha](https://etherspot.fyi/skandha/installation)**