Merge branch 'develop' into feature/SKALE-2572-api-call-version

.github/workflows/dockerimage.yml

@@ -18,7 +18,7 @@ jobs:
         run : |
           export BRANCH=${GITHUB_REF##*/}
           echo "Branch $BRANCH"
-          export VERSION=$(cat SGXWALLET_VERSION)
+          export VERSION=$(cat VERSION)
           export VERSION=$(bash ./scripts/calculate_version.sh $BRANCH $VERSION sgxwallet)
           echo "::set-env name=VERSION::$VERSION"
           echo "Version $VERSION"

.github/workflows/dockerimagebase.yml

@@ -21,7 +21,7 @@ jobs:
       run : |
         export BRANCH=${GITHUB_REF##*/}
         echo "Branch $BRANCH"
-        export VERSION=$(cat SGXWALLET_VERSION)
+        export VERSION=$(cat VERSION)
         export VERSION=$(bash ./scripts/calculate_version.sh $BRANCH $VERSION sgxwallet_base)
         echo "::set-env name=VERSION::$VERSION"
         echo "Version $VERSION"

.github/workflows/dockerimagesim.yml

@@ -22,7 +22,7 @@ jobs:
       run : |
         export BRANCH=${GITHUB_REF##*/}
         echo "Branch $BRANCH"
-        export VERSION=$(cat SGXWALLET_VERSION)
+        export VERSION=$(cat VERSION)
         export VERSION=$(bash ./scripts/calculate_version.sh $BRANCH $VERSION sgxwalletsim)
         echo "::set-env name=VERSION::$VERSION"
         echo "Version $VERSION"

VERSION

+1.49
\ No newline at end of file

scripts/build_and_publish.sh

@@ -8,7 +8,7 @@ DOCKERFILE=$2
 : "${VERSION?Need to set VERSION}"
 : "${BRANCH?Need to set BRANCH}"
 
-NAME=schain
+NAME=sgx
 REPO_NAME=skalenetwork/$NAME
 IMAGE_NAME=$REPO_NAME:$CONTAINER:$VERSION
 LATEST_IMAGE_NAME=$REPO_NAME:$CONTAINER:$BRANCH-latest

scripts/calculate_version.sh

@@ -41,6 +41,10 @@ fi
 
 for (( VERSION_NUMBER=0; ; VERSION_NUMBER++ ))
 do
+    if [ "$VERSION" = "1.49" ] && [ "$VERSION_NUMBER" < "4" ]
+    then
+        VERSION_NUMBER=4
+    fi
     RESULT_VERSION="$CONTAINER:$VERSION-$LABEL.$VERSION_NUMBER"
     if ! [ $(git tag -l ?$RESULT_VERSION) ]
     then