Now using buildtool.

Author: MickMake

.goreleaser.yml

@@ -1,14 +1,15 @@
-# This is an example goreleaser.yaml file with some sane defaults.
-# Make sure to check the documentation at http://goreleaser.com
+################################################################################
+project_name: deploywp
+
+
+################################################################################
 before:
   hooks:
-    # you may remove this if you don't use vgo
     - go mod download
-    # you may remove this if you don't need go generate
     - go generate ./...
-    # Make sure pkgreflect is installed.
-    - make pkgreflect
 
+
+################################################################################
 builds:
 - env:
   - CGO_ENABLED=0
@@ -18,59 +19,74 @@ builds:
   goos:
     - linux
     - darwin
-    # windows
+    - windows
   goarch:
-    # 386
+    - 386
     - amd64
-    # arm
-    # arm64
+    - arm
+    - arm64
+
 
+################################################################################
 archives:
-- replacements:
-    darwin: Darwin
-    linux: Linux
-    windows: Windows
-    386: i386
-    amd64: x86_64
+  -
+    name_template: "{{ .ProjectName }}-{{ .Os }}_{{ .Arch }}"
+
+    replacements:
+      darwin: darwin
+      linux: linux
+      windows: windows
+      386: i386
+      amd64: x86_64
+
+    # Set to true, if you want all files in the archive to be in a single directory.
+    # If set to true and you extract the archive 'goreleaser_Linux_arm64.tar.gz',
+    # you get a folder 'goreleaser_Linux_arm64'.
+    # If set to false, all files are extracted separately.
+    # You can also set it to a custom folder name (templating is supported).
+    # Default is false.
+    wrap_in_directory: false
+
+    # Archive format. Valid options are `tar.gz`, `tar.xz`, `gz`, `zip` and `binary`.
+    # If format is `binary`, no archives are created and the binaries are instead
+    # uploaded directly.
+    # Default is `tar.gz`.
+    format: tar.gz
 
+    # Can be used to change the archive formats for specific GOOSs.
+    # Most common use case is to archive as zip on Windows.
+    # Default is empty.
+    #format_overrides:
+    #  - goos: windows
+    #    format: zip
+
+    # Additional files/template/globs you want to add to the archive.
+    # Defaults are any files matching `LICENCE*`, `LICENSE*`,
+    # `README*` and `CHANGELOG*` (case-insensitive).
+    #files:
+    #  - LICENSE.txt
+    #  - README_{{.Os}}.md
+    #  - CHANGELOG.md
+    #  - docs/*
+    #  - design/*.png
+    #  - templates/**/*
+
+
+################################################################################
 checksum:
   name_template: 'checksums.txt'
 
+
+################################################################################
 snapshot:
   name_template: "{{ .Tag }}-next"
 
+
+################################################################################
 changelog:
   sort: asc
   filters:
     exclude:
     - '^docs:'
     - '^test:'
 
-#release:
-#  github:
-#    owner: newclarity
-#    name: launch
-#
-#  # IDs of the archives to use.
-#  # Defaults to all.
-#  ids:
-#    # foo
-#    # bar
-#
-#  # You can change the name of the GitLab release.
-#  # Default is `{{.Tag}}`
-#  # name_template: "{{.ProjectName}}-v{{.Version}} {{.Env.USER}}"
-#  name_template: "Release {{.ProjectName}}-v{{.Version}} {{.Env.USER}}"
-#
-#  # You can disable this pipe in order to not upload any artifacts to
-#  # GitLab.
-#  # Defaults to false.
-#  disable: true
-#
-#  # You can add extra pre-existing files to the release.
-#  # The filename on the release will be the last part of the path (base). If
-#  # another file with the same name exists, the latest one found will be used.
-#  # Defaults to empty.
-#  extra_files:
-#    - glob: ./bin/*
-

.idea/workspace.xml

@@ -1,81 +1,52 @@
-PKGREFLECT := $(shell which pkgreflect)
-GODOCMD := $(shell which godocdown)
-BINARY := $(shell tools/getBinary.sh)
-VERSION := $(shell tools/getVersion.sh)
-COMMENT := $(shell tools/getComment.sh)
-
+################################################################################
+ifeq (, $(shell which buildtool))
+$(warning "Installing buildtool...")
+$(warning "go get github.com/gearboxworks/buildtool")
+$(shell go get github.com/gearboxworks/buildtool)
+endif
+BUILDTOOL := $(shell which buildtool)
+ifeq (, $(BUILDTOOL))
+$(error "No buildtool found...")
+endif
+################################################################################
 
 all:
-	@echo "Current launch version is:	v$(VERSION)"
-	@echo "Last commit message is:		'$(COMMENT)'"
-	@echo ""
 	@echo "build		- Build for local testing."
 	@echo "release		- Build for published release."
 	@echo "push		- Push repo to GitHub."
-	@echo "doc		- Build GoLang documentation."
 	@echo ""
 	@echo "build-docker	- Build Docker cotainer."
 	@echo "test-run		- Run a test using native GoLang."
 	@echo "test-template	- Run a test using GoLang template."
 	@echo "test-docker	- Run a test using native GoLang within container."
-	@echo "pkgreflect	- Install 'pkgreflect' - Used to auto-discover exported functions."
-
+	@echo ""
+	@$(BUILDTOOL) get all
 
 build:
-	@echo "Current $(BINARY) version is v$(VERSION)"
 	@make pkgreflect
-	@goreleaser --snapshot --skip-publish --rm-dist
-
+	@$(BUILDTOOL) build
 
 release:
-	@echo "Current $(BINARY) version is v$(VERSION)"
 	@make pkgreflect
-	@make push
-	@git tag -a v$(VERSION) -m '"Release v$(VERSION)"'
-	@git push origin v$(VERSION)
-	@goreleaser --rm-dist
-
+	@$(BUILDTOOL) release
 
 push:
-	@echo "Pushing to: $(shell git branch)"
-	@git config core.hooksPath .git-hooks
-	@git add .
-	@git commit -m '"$(COMMENT)"' .
-	@git push
-
+	@make pkgreflect
+	@$(BUILDTOOL) push
 
-doc:
-ifeq ($(GODOCMD),)
-	@echo "godocdown - Installing"
-	@go install github.com/robertkrimen/godocdown/godocdown
-else
-	@echo "godocdown - already installed here $(GODOCMD)"
-endif
-	@$(GODOCMD) 
+pkgreflect:
+	@$(BUILDTOOL) pkgreflect jtc/helpers
 
 build-docker:
 	@make -C docker
 
-
 test-run:
 	@./bin/deploywp run --chdir --json tests/deploywp.json prod
 
-
 test-template:
 	#@./bin/deploywp load tests/deploywp.json prod
 	@./tests/deploywp.tmpl prod
 
-
 test-docker:
 	@launch -q -p tests -m tests shell deploywp:0.9 deploywp run
 
-
-pkgreflect:
-ifeq ($(PKGREFLECT),)
-	@echo "pkgreflect - Installing"
-	@go install github.com/ungerik/pkgreflect
-else
-	@echo "pkgreflect - already installed here $(PKGREFLECT)"
-endif
-	@$(PKGREFLECT) -notests jtc/helpers
-

Makefile

@@ -84,6 +84,7 @@ github.com/huandu/xstrings v1.3.1 h1:4jgBlKK6tLKFvO8u5pmYjG91cqytmDCDvGh7ECVFfFs
 github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
 github.com/imdario/mergo v0.3.9 h1:UauaLniWCFHWd+Jp9oCEkTBj8VO/9DKg3PV3VCNMDIg=
 github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
+github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=