Skip to content

Commit 6c47f54

Browse files
authored
Version v0.2.2
- Automate binary version
1 parent 44837ee commit 6c47f54

File tree

5 files changed

+16
-3
lines changed

5 files changed

+16
-3
lines changed

.github/workflows/build-by-commit.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ on:
66
pull_request:
77
branches: [ master ]
88

9+
env:
10+
ARTIFACT_VERSION: ${{ github.ref }}
11+
912
jobs:
1013

1114
build:

.github/workflows/build-by-tag.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ on:
55
tags:
66
- 'v[0-9]+.[0-9]+.[0-9]+'
77

8+
env:
9+
ARTIFACT_VERSION: ${{ github.ref }}
10+
811
jobs:
912

1013
build:

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Release history
22

3+
## v0.2.2
4+
5+
- Automate binary version
6+
37
## v0.2.1
48

59
- Improve help tips

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ COMMIT := $(shell git rev-parse HEAD)
2121
VERSION ?= $(shell git describe --always --tags)
2222
GOOS ?= $(shell go env GOOS)
2323
GOPATH ?= $(shell go env GOPATH)
24+
ARTIFACT_VERSION ?= local
2425

2526
BUILDDIR := $(shell pwd)/out
2627
PLATFORMS ?= darwin/amd64 darwin/arm64 linux/amd64
@@ -66,12 +67,12 @@ all: lint build deploy
6667
.PHONY: dev
6768
dev: CGO_ENABLED := 1
6869
dev:
69-
go build -race -o $(PROJECT) cmd/$(PROJECT)/main.go
70+
go build -race -o $(PROJECT) -ldflags="-X main.Version=$(ARTIFACT_VERSION)" cmd/$(PROJECT)/main.go
7071

7172
.PHONY: build
7273
build: $(BUILDDIR)
7374
cd cmd/$(PROJECT) && \
74-
GOFLAGS="-trimpath" gox -osarch="$(PLATFORMS)" -output="$(BUILDDIR)/$(PROJECT)-{{.OS}}-{{.Arch}}" && \
75+
GOFLAGS="-trimpath" gox -ldflags="-X main.Version=$(ARTIFACT_VERSION)" -osarch="$(PLATFORMS)" -output="$(BUILDDIR)/$(PROJECT)-{{.OS}}-{{.Arch}}" && \
7576
cd ../..
7677

7778
.PHONY: lint

cmd/kubectl-nsenter/main.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,12 @@ import (
1010
"time"
1111
)
1212

13+
var Version = "local"
14+
1315
func main() {
1416
app := &cli.App{
1517
Name: "kubectl-nsenter",
16-
Version: "v0.2.1",
18+
Version: Version,
1719
Compiled: time.Now(),
1820
Authors: []*cli.Author{
1921
{

0 commit comments

Comments
 (0)