Merge pull request #87 from skalenetwork/feature/SKALE-2202-versioning

SKLAE-2202 fix build script and calculating version

.github/workflows/dockerimage.yml

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

.github/workflows/dockerimagebase.yml

@@ -22,6 +22,7 @@ jobs:
         export BRANCH=${GITHUB_REF##*/}
         echo "Branch $BRANCH"
         export VERSION=$(cat VERSION)
+        echo "Version $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

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

docker/start.sh

@@ -38,21 +38,12 @@ fi
 
 if [[ "$1" == "-t" ]]; then
 echo "Test run requested"
-#./testw [bls-key-encrypt]
-./testw [bls-key-encrypt-decrypt]
+./testw [bls-key-encrypt]
 ./testw [dkg-encr-sshares]
 ./testw [dkg-verify]
-./testw [ecdsa]
-./testw [test]
-./testw [get-pub-ecdsa-key]
-./testw [bls-dkg]
-./testw [api]
 ./testw [get-server-status]
-./testw [many-threads]
-./testw [ecsa-api]
 ./testw [dkg-api]
-./testw [is-poly
-#./testw [bls-sign]
+./testw [dkg-poly-exists]
 ./testw [aes-encrypt-decrypt]
 else
    ./sgxwallet $1 $2 $3 $4

scripts/build_and_publish.sh

@@ -10,13 +10,13 @@ DOCKERFILE=$2
 
 NAME=sgx
 REPO_NAME=skalenetwork/$NAME
-IMAGE_NAME=$REPO_NAME:$CONTAINER:$VERSION
+IMAGE_NAME=$REPO_NAME:$VERSION
 LATEST_IMAGE_NAME=$REPO_NAME:$CONTAINER:$BRANCH-latest
 
 # Build image
 
 echo "Building $IMAGE_NAME..."
-docker build -t "$IMAGE_NAME" --file "$DOCKERFILE" || exit $?
+docker build -f "$DOCKERFILE" -t "$IMAGE_NAME" || exit $?
 docker tag "$IMAGE_NAME" "$LATEST_IMAGE_NAME"
 
 echo "========================================================================================="

scripts/calculate_version.sh

@@ -41,7 +41,7 @@ fi
 
 for (( VERSION_NUMBER=0; ; VERSION_NUMBER++ ))
 do
-    if [ "$VERSION" = "1.49" ] && [ "$VERSION_NUMBER" < "4" ]
+    if [ "$VERSION" = "1.49" ] && [ "$VERSION_NUMBER" < 4 ]
     then
         VERSION_NUMBER=4
     fi

testw.cpp

@@ -875,11 +875,11 @@ TEST_CASE_METHOD(TestFixture, "PolyExists test", "[dkg-poly-exists]") {
 
     Json::Value polyExists = c.isPolyExists(polyName);
 
-    REQUIRE(polyExists["exists"].asBool());
+    REQUIRE(polyExists["IsExist"].asBool());
 
     Json::Value polyDoesNotExist = c.isPolyExists("Vasya");
 
-    REQUIRE(!polyDoesNotExist["exists"].asBool());
+    REQUIRE(!polyDoesNotExist["IsExist"].asBool());
 
 
 }