Merge pull request #393 from benluddy/version-from-tag

Embed version at link time based on git tags instead of a file.

Author: openshift-merge-robot

Dockerfile

@@ -9,7 +9,6 @@ ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
 
 WORKDIR /src
 
-COPY OPM_VERSION OPM_VERSION
 COPY vendor vendor
 COPY cmd cmd
 COPY pkg pkg

Makefile

@@ -3,8 +3,8 @@ CMDS := $(addprefix bin/, $(shell ls ./cmd | grep -v opm))
 OPM := $(addprefix bin/, opm)
 SPECIFIC_UNIT_TEST := $(if $(TEST),-run $(TEST),)
 PKG := github.com/operator-framework/operator-registry
-GIT_COMMIT := $(shell git rev-parse --short HEAD)
-OPM_VERSION := $(shell cat OPM_VERSION)
+GIT_COMMIT := $(or $(SOURCE_GIT_COMMIT),$(shell git rev-parse --short HEAD))
+OPM_VERSION := $(or $(SOURCE_GIT_TAG),$(shell git describe --always --tags HEAD))
 BUILD_DATE := $(shell date -u +'%Y-%m-%dT%H:%M:%SZ')
 TAGS := -tags "json1"
 # -race is only supported on linux/amd64, linux/ppc64le, linux/arm64, freebsd/amd64, netbsd/amd64, darwin/amd64 and windows/amd64

OPM_VERSION

@@ -4,17 +4,12 @@
 
 Releases of opm are built by travis, see the [travis.yml](../../.travis.yml) for details.
 
-opm follows semantic versioning, with the latest version in the OPM_VERSION file at the top-level of the operator-registry repository. 
-
+opm follows semantic versioning, with the latest version derived from the newest semver tag.
 
 ## Triggering a release
 
-
 Releases are triggered via tags. Make a new release by tagging a commit with an appropriate semver tag.
 
-Be sure to set the version in the OPM_VERSION file to reflect the new semver tag of opm before cutting the release. This ensures users 
-can accurately check which version of opm they are using via the `opm version` command. 
-
 ## Checking the build
 
 Builds for a release can be found [on travis](https://travis-ci.com/operator-framework/operator-registry). After triggering a build, watch for logs. If the build is successful, a new [release](https://github.com/operator-framework/operator-registry) should appear in GitHub.
@@ -44,4 +39,4 @@ $ travis setup releases -r operator-framework/operator-registry --force --pro
 When prompted, enter credentials for the of-deploy-robot account. Copy the api key from the newly generated `deploy` section in .travis.yml, place
 it in the right place in the actual deploy config, and delete the generated deploy section.
 
-You mean need to `travis login --pro` first.
+You mean need to `travis login --pro` first.