From 58bf9d55a8bcf842e6b52b50ab50e8b08c0de8a6 Mon Sep 17 00:00:00 2001 From: Bo0km4n Date: Sun, 5 Jul 2020 20:22:59 +0900 Subject: [PATCH] Fix conflicts VERSION file name on APFS --- Makefile | 2 +- TAG | 1 + VERSION | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 TAG delete mode 100644 VERSION diff --git a/Makefile b/Makefile index 580a7b6dc..999b37eae 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/TAG b/TAG new file mode 100644 index 000000000..be386c9ed --- /dev/null +++ b/TAG @@ -0,0 +1 @@ +0.33.0 diff --git a/VERSION b/VERSION deleted file mode 100644 index 7d07a1960..000000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -0.33.0 \ No newline at end of file