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

SKALE-2202 small fixes
skalenetwork · May 20, 2020 · 1aedf16 · 1aedf16
2 parents 67e1dd4 + ad4df84
commit 1aedf16
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 3 deletions.
diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
@@ -3,6 +3,9 @@ on: [push]
 jobs:
   build:
     runs-on: ubuntu-latest
+    env:
+      DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+      DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
     steps:
       - name: Login to docker
         env:
@@ -27,5 +30,19 @@ jobs:
           echo "::set-env name=RELEASE::$RELEASE"
           bash ./scripts/build_image.sh Dockerfile
           bash ./scripts/publish_image.sh Dockerfile
-
+      - name: Create Release
+        if: contains(github.ref, 'develop') || contains(github.ref, 'beta') || contains(github.ref, 'master') || contains(github.ref, 'stable')
+        id: create_release
+        uses: actions/create-release@latest
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+        with:
+          tag_name: ${{ env.VERSION }}
+          release_name: Release ${{ env.VERSION }}
+          body: |
+            Changes in this Release
+            - First Change
+            - Second Change
+          draft: false
+          prerelease: true
 
diff --git a/.github/workflows/dockerimagebase.yml b/.github/workflows/dockerimagebase.yml
@@ -6,6 +6,9 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    env:
+      DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+      DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
     steps:
     - name: Login to docker
       env:
@@ -29,4 +32,19 @@ jobs:
         export RELEASE=true
         echo "::set-env name=RELEASE::$RELEASE"
         bash ./scripts/build_image.sh DockerfileBase
-        bash ./scripts/publish_image.sh DockerfileBase
+        bash ./scripts/publish_image.sh DockerfileBase
+    - name: Create Release
+      if: contains(github.ref, 'develop') || contains(github.ref, 'beta') || contains(github.ref, 'master') || contains(github.ref, 'stable')
+      id: create_release
+      uses: actions/create-release@latest
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+      with:
+        tag_name: ${{ env.VERSION }}
+        release_name: Release ${{ env.VERSION }}
+        body: |
+          Changes in this Release
+          - First Change
+          - Second Change
+        draft: false
+        prerelease: true
diff --git a/scripts/calculate_version.sh b/scripts/calculate_version.sh
@@ -41,7 +41,7 @@ fi
 
 for (( VERSION_NUMBER=0; ; VERSION_NUMBER++ ))
 do
-    if [ "$VERSION" = "1.49" ] && [ "$VERSION_NUMBER" -le 4 ]
+    if [ "$VERSION" = "1.49" ] && [ "$VERSION_NUMBER" -lt 4 ]
     then
         VERSION_NUMBER=4
     fi