You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ro...@apache.org on 2019/04/06 17:10:59 UTC

[cloudstack-cloudmonkey] branch master updated: snapcraft fixes

This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack-cloudmonkey.git


The following commit(s) were added to refs/heads/master by this push:
     new 8eae8f5  snapcraft fixes
8eae8f5 is described below

commit 8eae8f554ee7e4e3d7144d287771eda9797d0a93
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Sat Apr 6 22:29:44 2019 +0530

    snapcraft fixes
    
    Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
---
 snap/snapcraft.yaml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index b059383..05dd93f 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -4,6 +4,8 @@ summary: Apache CloudStack CLI
 description: |
   An CLI and interactive shell that simplifies configuration and management of
   Apache CloudStack, the opensource IAAS cloud computing platform.
+
+base: core18
 license: Apache-2.0
 grade: stable
 confinement: strict
@@ -16,11 +18,8 @@ apps:
     - network
 
 parts:
-  go:
-    source-tag: go1.12.1
   cloudmonkey:
-    after: [go]
-    source: https://github.com/apache/cloudstack-cloudmonkey
+    source: .
     source-type: git
     source-tag: 6.0.0
     plugin: go
@@ -32,10 +31,10 @@ parts:
     override-build: |
       set -eu
       go version
-      GIT_SHA=$(git rev-parse --short HEAD)
-      DATE=$(date +%FT%T%z)
-      go build -mod=vendor -ldflags='-s -w -X main.GitSHA=$(GIT_SHA) -X main.BuildDate=$(DATE)' -o cmk cmk.go
+      go build -mod=vendor -ldflags="-s -w -X main.GitSHA=$(git rev-parse --short HEAD) -X main.BuildDate=$(date +%FT%T%z)" -o cmk cmk.go
       file cmk
+      chmod +x cmk
+      ./cmk -v
       mkdir -p $SNAPCRAFT_PART_INSTALL/bin
       mv cmk $SNAPCRAFT_PART_INSTALL/bin/
       strip --remove-section=.comment --remove-section=.note $SNAPCRAFT_PART_INSTALL/bin/cmk