diff options
| author | Jeff Carr <[email protected]> | 2024-12-15 08:46:23 -0600 |
|---|---|---|
| committer | Jeff Carr <[email protected]> | 2024-12-15 08:46:23 -0600 |
| commit | 139653ba8c6676f7e9e2b501e9806b2bd8f02045 (patch) | |
| tree | 93c9e4d2343d68bdec4cc6657ad70eefc2e08905 | |
| parent | 7bfd2406499d43e555ed878f27455f8b6f32fbda (diff) | |
add --minor argv. will it work?v0.22.41
| -rw-r--r-- | Makefile | 14 | ||||
| -rw-r--r-- | argv.go | 1 | ||||
| -rw-r--r-- | prepareRelease.go | 18 |
3 files changed, 21 insertions, 12 deletions
@@ -14,27 +14,25 @@ vet: build: echo "build it!" + touch resources/blank.so -rm resources/*.so -mkdir resources/ - cp -a ~/go/src/go.wit.com/toolkits/*/*.so resources/ + -cp -a ~/go/src/go.wit.com/toolkits/*/*.so resources/ + touch resources/blank.so GO111MODULE=off go build \ -ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}" install: goimports + touch resources/blank.so -rm resources/*.so - cp -a ~/go/src/go.wit.com/toolkits/*/*.so resources/ + -cp -a ~/go/src/go.wit.com/toolkits/*/*.so resources/ + touch resources/blank.so GO111MODULE=off go install \ -ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}" check-git-clean: @git diff-index --quiet HEAD -- || (echo "Git repository is dirty, please commit your changes first"; exit 1) -redomod: - rm -f go.* - GO111MODULE= go mod init - GO111MODULE= go mod tidy - go mod edit -go=1.20 - curl-help: curl --silent http://localhost:9419/help @@ -12,6 +12,7 @@ type args struct { // Release bool `arg:"--release" help:"do a release an exit"` DryRun bool `arg:"--dry-run,env:DRYRUN" help:"don't actually do the release"` Fix bool `arg:"--fix" help:"run fixGoMod() on startup"` + Minor bool `arg:"--minor" help:"increment minor verion numbers"` Reason string `arg:"--reason" help:"tag message"` DumpVersions bool `arg:"--dump-versions" help:"dump the versions file for go.wit.com"` Port int `arg:"--port" default:"9419" help:"do fun stuff with curl"` diff --git a/prepareRelease.go b/prepareRelease.go index c8ac608..4c14bf5 100644 --- a/prepareRelease.go +++ b/prepareRelease.go @@ -41,8 +41,13 @@ func makePrepareRelease() { master := check.GetMasterVersion() lastTag := check.GetLastTag() if master != lastTag { - // if v1.2.3 change to v.1.2.4 - check.IncrementTargetRevision() + if argv.Minor { + // if v1.2.3 change to v.1.3.0 + check.IncrementTargetMinor() + } else { + // if v1.2.3 change to v.1.2.4 + check.IncrementTargetRevision() + } if !runGoClean(check) { log.Info("go-mod-clean FAILED. THIS IS BAD.", check.GoPath) } @@ -58,8 +63,13 @@ func makePrepareRelease() { continue } log.Printf("dependancy checks indicate a new release is needed for %s\n", check.GetGoPath()) - // if v1.2.3 change to v.1.2.4 - check.IncrementTargetRevision() + if argv.Minor { + // if v1.2.3 change to v.1.3.0 + check.IncrementTargetMinor() + } else { + // if v1.2.3 change to v.1.2.4 + check.IncrementTargetRevision() + } // run go-mod-clean in each repo that needs to be updated if master == lastTag { // 'git notes' has something in it. clear it out |