Skip to content

Commit 8e023c7

Browse files
committed
remove VERSION, fix typos
1 parent a171980 commit 8e023c7

File tree

4 files changed

+3
-5
lines changed

4 files changed

+3
-5
lines changed

.github/workflows/release.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ jobs:
7474
version: ${{ github.ref }}
7575
arch: 'x86_64'
7676
summary: "Cortex-Tenant Service"
77-
homepage: "https://github.com/blind-oracle/cortex-tenant"
7877

7978
- uses: ncipollo/release-action@v1
8079
with:

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ DESCRIPTION := Cortex tenant proxy
44
URL := https://github.com/blind-oracle/cortex-tenant
55
LICENSE := MPL
66

7-
VERSION := $(shell cat VERSION)
7+
VERSION := $(shell git describe --exact-match --tags)
88
RELEASE := 1
99

1010
GO ?= go
@@ -17,7 +17,7 @@ build:
1717
GOARCH=amd64 \
1818
GOOS=linux \
1919
CGO_ENABLED=0 \
20-
$(GO) build -ldflags "-s -w -extldflags \"-static\" -X main.version=$(VERSION)"
20+
$(GO) build -ldflags "-s -w -extldflags \"-static\" -X main.Version=$(VERSION)"
2121

2222
prepare:
2323
cd deploy && \

VERSION

Lines changed: 0 additions & 1 deletion
This file was deleted.

config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ type config struct {
4040
Label string `env:"CT_TENANT_LABEL"`
4141
LabelList []string `yaml:"label_list" env:"CT_TENANT_LABEL_LIST" envSeparator:","`
4242
Prefix string `yaml:"prefix" env:"CT_TENANT_PREFIX"`
43-
PrefixPreferSource bool `yaml:"prefix_prefer_source" env:"CT_TENANT_PREFIX_PREFER_SOURCE`
43+
PrefixPreferSource bool `yaml:"prefix_prefer_source" env:"CT_TENANT_PREFIX_PREFER_SOURCE"`
4444
LabelRemove bool `yaml:"label_remove" env:"CT_TENANT_LABEL_REMOVE"`
4545
Header string `env:"CT_TENANT_HEADER"`
4646
Default string `env:"CT_TENANT_DEFAULT"`

0 commit comments

Comments
 (0)