From 8a5b9e19816e1cbb9515ad1963314c9707b6b9aa Mon Sep 17 00:00:00 2001 From: Emily Casey Date: Fri, 29 May 2020 12:51:37 -0400 Subject: [PATCH] Prepare for 0.8.0 release. * Adds VERSION file * bump upload-artifact github action to v2 * Uses wildcard for artifact upload, now that it's supported Geting the next version from the VERSION file should make the version number easier to find and increment. This should makes local builds easier, users no longer need to set LIFECYCLE_VERSION explicitly for every build. Signed-off-by: Emily Casey --- .github/workflows/build.yml | 6 ++---- Makefile | 2 +- README.md | 2 +- VERSION | 1 + 4 files changed, 5 insertions(+), 6 deletions(-) create mode 100644 VERSION diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fafa47ec3..1aa74d22f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,8 +11,6 @@ on: jobs: test-and-build: runs-on: ubuntu-latest - env: - LIFECYCLE_VERSION: 0.7.5 steps: - uses: actions/checkout@v2 - name: Set up go @@ -36,7 +34,7 @@ jobs: run: | make build make package - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v2 with: name: lifecycle-linux-x86-64 - path: out/lifecycle-v${{ env.LIFECYCLE_VERSION }}+linux.x86-64.tgz + path: out/lifecycle-v*+linux.x86-64.tgz diff --git a/Makefile b/Makefile index 0fbb6a818..cef1fbcf2 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ LDFLAGS+=-X 'github.com/buildpacks/lifecycle/cmd.SCMCommit=$(SCM_COMMIT)' LDFLAGS+=-X 'github.com/buildpacks/lifecycle/cmd.PlatformAPI=$(PLATFORM_API)' GOBUILD=go build $(GOFLAGS) -ldflags "$(LDFLAGS)" GOTEST=$(GOCMD) test $(GOFLAGS) -LIFECYCLE_VERSION?=0.0.0 +LIFECYCLE_VERSION?=$(shell cat VERSION) PLATFORM_API?=0.3 BUILDPACK_API?=0.2 SCM_REPO?=github.com/buildpacks/lifecycle diff --git a/README.md b/README.md index 58445a904..e277af072 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ $ make all ``` This will create an archive at `out/lifecycle-+linux.x86-64.tgz`. -By default, `LIFECYCLE_VERSION` is `0.0.0`. It can be changed by prepending `LIFECYCLE_VERSION=` to the +`LIFECYCLE_VERSION` defaults to the value in the `VERSION` file at the root of the repo . It can be changed by prepending `LIFECYCLE_VERSION=` to the `make` command. For example: ```bash diff --git a/VERSION b/VERSION new file mode 100644 index 000000000..8adc70fdd --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +0.8.0 \ No newline at end of file