Skip to content

Fix the version sub-command for the executables in this repository #2657

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Fix the version sub-command for the executables in this repository #2657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c692ca1
Remove the root OLM_VERSION file
timflannagan Feb 17, 2022
d5860c1
Ensure the correct OLM version information is produced
timflannagan Feb 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ COPY .git/HEAD .git/HEAD
COPY .git/refs/heads/. .git/refs/heads
RUN mkdir -p .git/objects
COPY Makefile Makefile
COPY OLM_VERSION OLM_VERSION
COPY pkg pkg
COPY vendor vendor
COPY go.mod go.mod
Expand Down
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ GO := GO111MODULE=on GOFLAGS="$(MOD_FLAGS)" go
GINKGO := $(GO) run github.com/onsi/ginkgo/v2/ginkgo
BINDATA := $(GO) run github.com/go-bindata/go-bindata/v3/go-bindata
GIT_COMMIT := $(shell git rev-parse HEAD)
GIT_VERSION := $(shell git describe --dirty --tags --always)
GIT_TAG := $(shell git describe --tags --abbrev=0)

# Phony prerequisite for targets that rely on the go build cache to determine staleness.
.PHONY: build test clean vendor \
Expand Down Expand Up @@ -98,7 +100,7 @@ build-util: bin/cpb
bin/cpb: FORCE
CGO_ENABLED=0 $(arch_flags) go build $(MOD_FLAGS) -ldflags '-extldflags "-static"' -o $@ ./util/cpb

$(CMDS): version_flags=-ldflags "-X $(PKG)/pkg/version.GitCommit=$(GIT_COMMIT) -X $(PKG)/pkg/version.OLMVersion=`cat OLM_VERSION`"
$(CMDS): version_flags=-ldflags "-X $(PKG)/pkg/version.GitCommit=$(GIT_COMMIT) -X $(PKG)/pkg/version.OLMVersion=$(GIT_VERSION)"
$(CMDS):
$(arch_flags) go $(build_cmd) $(MOD_FLAGS) $(version_flags) -tags $(BUILD_TAGS) -o bin/$(shell basename $@) $@

Expand Down Expand Up @@ -222,9 +224,7 @@ verify-manifests: manifests

verify: verify-codegen verify-mockgen verify-manifests

# before running release, bump the version in OLM_VERSION and push to master,
# then tag those builds in quay with the version in OLM_VERSION
release: ver=v$(shell cat OLM_VERSION)
release: ver=$(GIT_TAG)
release: manifests
@echo "Generating the $(ver) release"
docker pull $(IMAGE_REPO):$(ver)
Copy link
Member

@njhale njhale Feb 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there an ordering issue here? Will this image exist without a tag in the remote repo? If we push a tag before we generate the release manifests, then they won't be present in the release.

Copy link
Member Author

@timflannagan timflannagan Feb 20, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should be fine as we always override this ver variable during the release process, so the ordering problem shouldn't be an issue as we trigger the release process when a new git tag is created.

Side note: It felt like this target needs to be reworked but I didn't want to tackle any structuring changes in this PR.

Expand Down
1 change: 0 additions & 1 deletion OLM_VERSION
View file
Open in desktop

This file was deleted.