diff --git a/.goreleaser.yml b/.goreleaser.yml index bc5e51a..3867c44 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -3,12 +3,12 @@ builds: - main: ./cmd/atcoderHelper/main.go binary: ach ldflags: - - "-X github.com.yuchiki.atcoderHelper/cmd/atcoderHelper/cmd.version=\ + - "-X github.com.yuchiki.atcoderHelper/internal/cmd/ach/version.version=\ {{.Version}}" - - "-X github.com.yuchiki.atcoderHelper/cmd/atcoderHelper/cmd.commit=\ + - "-X github.com.yuchiki.atcoderHelper/internal/cmd/ach/version.commit=\ {{.Commit}}" - - "-X github.com.yuchiki.atcoderHelper/cmd/atcoderHelper/cmd.edited=''" - - "-X github.com.yuchiki.atcoderHelper/cmd/atcoderHelper/cmd.date=\ + - "-X github.com.yuchiki.atcoderHelper/internal/cmd/ach/version.edited=''" + - "-X github.com.yuchiki.atcoderHelper/internal/cmd/ach/version.date=\ {{.Date}}" goarch: - amd64 diff --git a/Makefile b/Makefile index 222aeaf..9af8c44 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION_PATH := github.com/yuchiki/atcoderHelper/cmd/atcoderHelper/cmd +VERSION_PATH := github.com/yuchiki/atcoderHelper/internal/cmd/ach/version LD_FLAGS := -X '$(VERSION_PATH).version=manual-build' LD_FLAGS += -X '$(VERSION_PATH).commit=$(shell git rev-parse HEAD)' LD_FLAGS += -X '$(VERSION_PATH).edited=$(shell if git diff HEAD --exit-code > /dev/null; then echo "HEAD"; else echo "edited"; fi)'