DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5851 from Bo0km4n/fix/conflicting-version-file

Browse source 
Fix conflicts of VERSION file
This commit is contained in:
Kubernetes Prow Robot 2020-07-05 08:20:49 -07:00 committed by GitHub
commit 384ee89e40
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -27,7 +27,7 @@ endif
SHELL=/bin/bash -o pipefail -o errexit
# Use the 0.0 tag for testing, it shouldn't clobber any release builds
TAG ?= $(shell cat VERSION)
TAG ?= $(shell cat TAG)
# e2e settings
# Allow limiting the scope of the e2e tests. By default run everything

1
TAG Normal file
View file

@ -0,0 +1 @@
0.33.0

1
VERSION
View file

@ -1 +0,0 @@
0.33.0