Skip to content

Commit 235b69e

Browse files
authored
Merge pull request #118 from appbaseio/feat/versioning
feat: add arc versioning
2 parents a5bbd53 + 2cbff1a commit 235b69e

3 files changed

Lines changed: 10 additions & 2 deletions

File tree

Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@ GT=go test
44
BUILD_DIR=build
55
PLUGIN_FLAGS=--buildmode=plugin
66
PLUGIN_BUILD_DIR=$(BUILD_DIR)/plugins
7-
7+
DEFAULT_VERSION=7.27.0
8+
VERSION := $(or $(VERSION),$(DEFAULT_VERSION))
9+
810
PLUGINS=$(shell ls -l plugins | grep ^d | awk '{ print $$9 }')
911
PLUGIN_MAIN_LOC_FUNC=plugins/$(1)/main/$(1).$(2)
1012
PLUGIN_LOC_FUNC=$(foreach PLUGIN,$(PLUGINS),$(call PLUGIN_MAIN_LOC_FUNC,$(PLUGIN),$(1)))
1113

1214
cmd: plugins
13-
$(GC) -ldflags "-w -X main.Billing=$(BILLING) -X main.HostedBilling=$(HOSTED_BILLING) -X main.ClusterBilling=$(CLUSTER_BILLING) -X main.PlanRefreshInterval=$(PLAN_REFRESH_INTERVAL) -X main.IgnoreBillingMiddleware=$(IGNORE_BILLING_MIDDLEWARE) -X main.Tier=$(TEST_TIER) -X main.FeatureCustomEvents=$(TEST_FEATURE_CUSTOM_EVENTS) -X main.FeatureSuggestions=$(TEST_FEATURE_SUGGESTIONS)" -o $(BUILD_DIR)/arc main.go
15+
$(GC) -ldflags "-w -X main.Billing=$(BILLING) -X main.HostedBilling=$(HOSTED_BILLING) -X main.ClusterBilling=$(CLUSTER_BILLING) -X main.PlanRefreshInterval=$(PLAN_REFRESH_INTERVAL) -X main.IgnoreBillingMiddleware=$(IGNORE_BILLING_MIDDLEWARE) -X main.Tier=$(TEST_TIER) -X main.FeatureCustomEvents=$(TEST_FEATURE_CUSTOM_EVENTS) -X main.FeatureSuggestions=$(TEST_FEATURE_SUGGESTIONS) -X main.Version=$(VERSION)" -o $(BUILD_DIR)/arc main.go
1416

1517
plugins: $(call PLUGIN_LOC_FUNC,so)
1618

main.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ var (
3636
port int
3737
pluginDir string
3838
https bool
39+
// Version arc version set during build
40+
Version string
3941
// PlanRefreshInterval can be used to define the custom interval to refresh the plan
4042
PlanRefreshInterval string
4143
// Billing is a build time flag
@@ -116,6 +118,7 @@ func main() {
116118
util.Billing = Billing
117119
util.HostedBilling = HostedBilling
118120
util.ClusterBilling = ClusterBilling
121+
util.Version = Version
119122

120123
if Billing == "true" {
121124
log.Println("You're running Arc with billing module enabled.")

util/util.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ var HostedBilling string
3131
// ClusterBilling is a build time variable
3232
var ClusterBilling string
3333

34+
// Version arc version
35+
var Version string
36+
3437
// RandStr returns "node" field of a UUID.
3538
// See: https://tools.ietf.org/html/rfc4122#section-4.1.6
3639
func RandStr() string {

0 commit comments

Comments
 (0)