Use CLI version from VERSION env or git tag (#159)

Signed-off-by: Aravinda Vishwanathapura <[email protected]>
kadalu · Jan 20, 2022 · 3855c46 · 3855c46
1 parent fb657e5
commit 3855c46
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/on-pr-submit.yml b/.github/workflows/on-pr-submit.yml
@@ -36,6 +36,6 @@ jobs:
       - name: Setup Test environment
         run: binnacle -v tests/setup.t
       - name: Build and Install Storage manager to nodes/containers
-        run: binnacle -v tests/install.t
+        run: VERSION="${{ github.ref_name }}" binnacle -v tests/install.t
       - name: Run all Tests
         run: binnacle -v tests/all
diff --git a/.github/workflows/on-release-tag.yml b/.github/workflows/on-release-tag.yml
@@ -20,7 +20,7 @@ jobs:
         run: |
             apk add --update --no-cache --force-overwrite sqlite-dev sqlite-static
             cd mgr
-            shards build --production --release --static --no-debug --stats --time
+            VERSION="${{ github.ref_name }}" shards build --production --release --static --no-debug --stats --time
       - name: Rename kadalu to kadalu-amd64
         run: |
           mv mgr/bin/kadalu mgr/bin/kadalu-amd64
@@ -46,7 +46,7 @@ jobs:
       - name: Build
         working-directory: .
         run: |
-          docker run -i -v `pwd`:/workspace -w /workspace --rm multiarch/alpine:aarch64-edge /bin/sh -c "echo '@edge http://dl-cdn.alpinelinux.org/alpine/edge/community' >>/etc/apk/repositories; apk add --update --no-cache --force-overwrite llvm12-dev llvm12-static crystal@edge gc-dev gcc gmp-dev libatomic_ops libevent-static musl-dev pcre-dev libxml2-dev openssl-dev openssl-libs-static tzdata yaml-dev zlib-static make git g++ shards@edge yaml-static sqlite-dev sqlite-static; cd mgr; shards build --production --release --static --no-debug --stats --time"
+          docker run -i -v `pwd`:/workspace -w /workspace --rm multiarch/alpine:aarch64-edge /bin/sh -c "echo '@edge http://dl-cdn.alpinelinux.org/alpine/edge/community' >>/etc/apk/repositories; apk add --update --no-cache --force-overwrite llvm12-dev llvm12-static crystal@edge gc-dev gcc gmp-dev libatomic_ops libevent-static musl-dev pcre-dev libxml2-dev openssl-dev openssl-libs-static tzdata yaml-dev zlib-static make git g++ shards@edge yaml-static sqlite-dev sqlite-static; cd mgr; VERSION="${{ github.ref_name }}" shards build --production --release --static --no-debug --stats --time"
       - name: Rename kadalu to kadalu-amd64
         run: |
           sudo mv mgr/bin/kadalu mgr/bin/kadalu-arm64

diff --git a/mgr/src/main.cr b/mgr/src/main.cr
@@ -2,7 +2,8 @@ require "option_parser"
 
 require "./cmds/*"
 
-VERSION = {{ `shards version #{__DIR__}`.chomp.stringify }}
+# Set VERSION during build time
+VERSION = {{ env("VERSION") && env("VERSION") != "" ? env("VERSION") : `git describe --always --tags --match "[0-9]*" --dirty`.chomp.stringify }}
 
 module CLI
   def self.run(args)
@@ -17,12 +18,12 @@ module CLI
       end
 
       parser_1.on("--version", "Show Version information") do
-        puts "kadalu #{VERSION}"
+        puts "Kadalu Storage #{VERSION}"
         exit
       end
 
       parser_1.on("version", "Show Version information") do
-        puts "kadalu #{VERSION}"
+        puts "Kadalu Storage #{VERSION}"
         exit
       end
 

diff --git a/tests/install.t b/tests/install.t
@@ -4,7 +4,7 @@ USE_REMOTE_PLUGIN "docker"
 nodes = ["server1", "server2", "server3"]
 
 # Static build Kadalu Storage Manager
-TEST "docker run --rm -i -v $PWD:/workspace -w /workspace crystallang/crystal:1.2.0-alpine /bin/sh -c \"apk add --update --no-cache --force-overwrite sqlite-dev sqlite-static && cd mgr && shards install && shards build --static\""
+TEST "docker run --rm -i -v $PWD:/workspace -w /workspace crystallang/crystal:1.2.0-alpine /bin/sh -c \"apk add --update --no-cache --force-overwrite sqlite-dev sqlite-static && cd mgr && shards install && VERSION=#{ENV.fetch("VERSION", "")} shards build --static\""
 
 # Install the Static binary to all containers/nodes
 # and copy the service files