Merge pull request #50 from ClusterLabs/https-next

Version 0.0.4

.ci/get_version_from_git.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+TAG=$(git describe --tags --abbrev=0 2>/dev/null)
+SUFFIX=$(git show -s --format=%ct.%h HEAD)
+
+if [ -n "${TAG}" ]; then
+  COMMITS_SINCE_TAG=$(git rev-list ${TAG}.. --count)
+  if [ "${COMMITS_SINCE_TAG}" -gt 0 ]; then
+    SUFFIX="dev${COMMITS_SINCE_TAG}.${SUFFIX}"
+  fi
+else
+  TAG="0"
+fi
+
+echo "${TAG}+git.${SUFFIX}"

.travis.yml

@@ -8,30 +8,9 @@ services:
   - docker
 
 stages:
-  - test
   - delivery
   - submit
 
-jobs:
-  include:
-    - stage: test
-      before_install:
-          - docker pull shap/godev:latest
-      before_script:
-          - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-          - chmod +x ./cc-test-reporter
-          - ./cc-test-reporter before-build
-      script:
-          - ./enter --ci
-      after_script:
-          - ./cc-test-reporter after-build -t gocov --exit-code $TRAVIS_TEST_RESULT
-
-    - stage: delivery
-      if: type != pull_request
-      env:
-        - FOLDER=/package
-        - PACKAGE_NAME=hawk-apiserver
-
       before_install:
         - docker pull shap/continuous_deliver:latest
 
@@ -63,4 +42,4 @@ jobs:
           -e PACKAGE_NAME=$PACKAGE_NAME \
           -e TARGET_PROJECT=$TARGET_PROJECT \
           shap/continuous_deliver \
-          /bin/bash -c "cd /package;/scripts/submit.sh"
+          /bin/bash -c "cd /package;/scripts/submit.sh"

Makefile

@@ -0,0 +1,12 @@
+# this is the what ends up in the RPM "Version" field and embedded in the --version CLI flag
+VERSION ?= $(shell .ci/get_version_from_git.sh)
+
+default: build test
+build:
+	go vet ./...
+	go build -ldflags "-s -w -X main.version=$(VERSION)"
+	go mod tidy
+test:
+	go test ./... -v
+
+.PHONY: build test