Skip to content

Commit fb1c08d

Browse files
committed
bump-version: remove sembump
- sembump (github.com/jessfraz/junk/sembump) is unsupported by the author and won't build on mac/windows. Make NEW_VERSION explicit. - make ... bump-version manged the low-version on the compatibility table.
1 parent 50cf8f0 commit fb1c08d

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

Makefile

+2-4
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD)
1010
LDFLAGS ?= -X github.com/digitalocean/csi-digitalocean/driver.version=${VERSION} -X github.com/digitalocean/csi-digitalocean/driver.commit=${COMMIT} -X github.com/digitalocean/csi-digitalocean/driver.gitTreeState=${GIT_TREE_STATE}
1111
PKG ?= github.com/digitalocean/csi-digitalocean/cmd/do-csi-plugin
1212

13-
## Bump the version in the version file. Set BUMP to [ major | minor | patch ]
14-
BUMP := patch
1513
VERSION ?= $(shell cat VERSION)
1614

1715
all: test
@@ -20,8 +18,8 @@ publish: compile build push clean
2018

2119
.PHONY: bump-version
2220
bump-version:
23-
@go get -u github.com/jessfraz/junk/sembump # update sembump tool
24-
$(eval NEW_VERSION = $(shell sembump --kind $(BUMP) $(VERSION)))
21+
@[ "${NEW_VERSION}" ] || ( echo "NEW_VERSION must be set (ex. make NEW_VERSION=v1.x.x bump-version)"; exit 1 )
22+
@(echo ${NEW_VERSION} | grep -E "^v") || ( echo "NEW_VERSION must be a semver ('v' prefix is required)"; exit 1 )
2523
@echo "Bumping VERSION from $(VERSION) to $(NEW_VERSION)"
2624
@echo $(NEW_VERSION) > VERSION
2725
@cp deploy/kubernetes/releases/csi-digitalocean-${VERSION}.yaml deploy/kubernetes/releases/csi-digitalocean-${NEW_VERSION}.yaml

README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,19 @@ bumped following the rules below:
3636
</thead>
3737
<tbody>
3838
<tr>
39-
<td>v0.1.0 - v0.2.x</td>
39+
<td>v0.1.x - v0.2.x</td>
4040
<td>yes</td>
4141
<td>no</td>
4242
<td>no</td>
4343
</tr>
4444
<tr>
45-
<td>v0.3.0 - v0.4.x</td>
45+
<td>v0.3.x - v0.4.x</td>
4646
<td>no</td>
4747
<td>yes</td>
4848
<td>no</td>
4949
</tr>
5050
<tr>
51-
<td>v1.0.0 - v1.0.x</td>
51+
<td>v1.0.x - v1.0.x</td>
5252
<td>no</td>
5353
<td>no</td>
5454
<td>yes</td>
@@ -226,7 +226,7 @@ Dependencies are managed via [Go modules](https://github.com/golang/go/wiki/Modu
226226
To release a new version bump first the version:
227227

228228
```
229-
$ make bump-version
229+
$ make NEW_VERSION=v1.0.0 bump-version
230230
```
231231

232232
Make sure everything looks good. Create a new branch with all changes:

0 commit comments

Comments
 (0)