Katenary/katenary
2
0
Fork 0
Code Issues 7 Pull Requests Actions Packages Projects Releases 15 Wiki Activity

feat(package) Version were not correctly set

Browse Source 
As the code moved in "internal" package, we need to set the version to
the new location
This commit is contained in:
Patrice Ferlet
2025-08-04 16:13:35 +02:00
parent 0d36a48f93
commit b13e922966
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
makefiles/build.mk
View File

@@ -1,4 +1,5 @@
## BUILD ## BUILD
GO_BUILD=go build -ldflags="-X 'github.com/katenary/katenary/internal/generator.Version=$(VERSION)'" -trimpath -o $(OUTPUT) ./cmd/katenary
# Simply build the binary for the current OS and architecture # Simply build the binary for the current OS and architecture
build: pull katenary build: pull katenary
@@ -14,11 +15,10 @@ ifeq ($(GO),local)
@echo "=> Build on host using go" @echo "=> Build on host using go"
$(GO_BUILD) $(GO_BUILD)
else else
@echo "=> Build in container using" $(CTN) echo "=> Build in container using" $(CTN)
@$(GO_OCI) $(GO_BUILD) $(GO_OCI) $(GO_BUILD)
endif endif
# Make dist, build executables for all platforms, sign them, and compress them with upx if possible. # Make dist, build executables for all platforms, sign them, and compress them with upx if possible.
# Also generate the windows installer. # Also generate the windows installer.
binaries: prepare $(BINARIES) binaries: prepare $(BINARIES)

7
makefiles/containers.mk
View File

@@ -27,7 +27,6 @@ else
$(CTN_USERMAP) \ $(CTN_USERMAP) \
$(PKG_OCI_IMAGE) $(PKG_OCI_IMAGE)
endif endif
GO_BUILD=go build -ldflags="-X 'katenary/generator.Version=$(VERSION)'" -o $(OUTPUT) ./cmd/katenary
BUILD_IMAGE=docker.io/golang:$(GOVERSION) BUILD_IMAGE=docker.io/golang:$(GOVERSION)
GO_OCI:=$(CTN) run --rm -it \ GO_OCI:=$(CTN) run --rm -it \
@@ -45,3 +44,9 @@ packager-oci-image:
builder-oci-image: builder-oci-image:
@$(CTN) build -t go-builder:$(GOVERSION) ./oci/builder \ @$(CTN) build -t go-builder:$(GOVERSION) ./oci/builder \
--build-arg GOVERSION=$(GOVERSION) 1>/dev/null --build-arg GOVERSION=$(GOVERSION) 1>/dev/null
katenary-oci:
$(CTN) build -f oci/katenary/Containerfile -t katenary:$(VERSION) \
--build-arg GOVERSION=$(GOVERSION) \
--build-arg VERSION=$(VERSION) \
./
$(CTN) tag katenary:$(VERSION) katenary:latest