Skip to content

Commit

Permalink
remove VERSION, fix typos
Browse files Browse the repository at this point in the history
  • Loading branch information
blind-oracle committed Dec 18, 2024
1 parent a171980 commit 8e023c7
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 5 deletions.
1 change: 0 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ jobs:
version: ${{ github.ref }}
arch: 'x86_64'
summary: "Cortex-Tenant Service"
homepage: "https://github.com/blind-oracle/cortex-tenant"

- uses: ncipollo/release-action@v1
with:
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ DESCRIPTION := Cortex tenant proxy
URL := https://github.com/blind-oracle/cortex-tenant
LICENSE := MPL

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

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

prepare:
cd deploy && \
Expand Down
1 change: 0 additions & 1 deletion VERSION

This file was deleted.

2 changes: 1 addition & 1 deletion config.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ type config struct {
Label string `env:"CT_TENANT_LABEL"`
LabelList []string `yaml:"label_list" env:"CT_TENANT_LABEL_LIST" envSeparator:","`
Prefix string `yaml:"prefix" env:"CT_TENANT_PREFIX"`
PrefixPreferSource bool `yaml:"prefix_prefer_source" env:"CT_TENANT_PREFIX_PREFER_SOURCE`
PrefixPreferSource bool `yaml:"prefix_prefer_source" env:"CT_TENANT_PREFIX_PREFER_SOURCE"`
LabelRemove bool `yaml:"label_remove" env:"CT_TENANT_LABEL_REMOVE"`
Header string `env:"CT_TENANT_HEADER"`
Default string `env:"CT_TENANT_DEFAULT"`
Expand Down

0 comments on commit 8e023c7

Please sign in to comment.