1
0
mirror of https://github.com/strongdm/comply synced 2025-12-15 10:43:47 +00:00

Compare commits

...

23 Commits

Author SHA1 Message Date
Justin McCarthy
7a15435a49 increment patch for release 2018-05-10 23:49:32 -07:00
Justin McCarthy
5076283af5 increment patch for release 2018-05-10 23:41:18 -07:00
Justin McCarthy
2a19c67031 version 2018-05-10 23:41:04 -07:00
Justin McCarthy
42922cb567 increment patch for release 2018-05-10 23:24:05 -07:00
Justin McCarthy
bb1a7f3f0f homebrew 2018-05-10 23:23:50 -07:00
Justin McCarthy
a383b24a66 increment patch for release 2018-05-10 17:58:20 -07:00
Justin McCarthy
2d0b13fb63 brew 2018-05-10 17:58:07 -07:00
Justin McCarthy
0986a313bc increment patch for release 2018-05-10 16:44:58 -07:00
Justin McCarthy
18c017009d increment patch for release 2018-05-10 16:43:21 -07:00
Justin McCarthy
ac11f4ac9d introduce brew make target 2018-05-10 16:43:02 -07:00
Justin McCarthy
911b84dedc increment minor for release 2018-05-10 00:39:06 -07:00
Justin McCarthy
d212e627fd minor release 2018-05-10 00:38:38 -07:00
Justin McCarthy
29edb6c90a intro minor release 2018-05-10 00:38:19 -07:00
Justin McCarthy
62d05e3358 increment patch for release 2018-05-10 00:37:05 -07:00
Justin McCarthy
e08d88ee49 increment patch for release 2018-05-10 00:34:50 -07:00
Justin McCarthy
80bdc44f14 ordering 2018-05-10 00:34:39 -07:00
Justin McCarthy
41dbf7ca19 message 2018-05-10 00:34:10 -07:00
Justin McCarthy
182aa3d9ed v1.0.12 2018-05-10 00:32:15 -07:00
Justin McCarthy
57ea96e4c9 define version immediately before use 2018-05-10 00:31:58 -07:00
Justin McCarthy
5a58efd983 v1.0.11 2018-05-10 00:28:05 -07:00
Justin McCarthy
68a67cb50b v1.0.10 2018-05-10 00:26:20 -07:00
Justin McCarthy
06afa72dee redefine verison 2018-05-10 00:26:08 -07:00
Justin McCarthy
fc9c908a42 v1.0.9 2018-05-10 00:22:02 -07:00
5 changed files with 57 additions and 10 deletions

1
.gitignore vendored
View File

@@ -1,2 +1,3 @@
comply
output
dist

View File

@@ -1,23 +1,37 @@
.DEFAULT_GOAL := comply
GO_SOURCES := $(shell find . -name '*.go')
THEME_SOURCES := $(shell find themes)
VERSION := $(shell git describe --tags --always --dirty="-dev")
LDFLAGS := -ldflags='-X "cli.Version=$(VERSION)"'
assets: $(THEME_SOURCES)
go-bindata-assetfs -pkg theme -prefix themes themes/...
@go get github.com/jteeuwen/go-bindata/...
@go get github.com/elazarl/go-bindata-assetfs/...
@go install github.com/elazarl/go-bindata-assetfs
go-bindata-assetfs -o bindata.go -pkg theme -prefix themes themes/...
mv bindata_assetfs.go internal/theme/themes_bindata.go
comply: assets $(GO_SOURCES)
go build github.com/strongdm/comply/cmd/comply
@# $(eval VERSION := $(shell git describe --tags --always --dirty="-dev"))
@# $(eval LDFLAGS := -ldflags='-X "github.com/strongdm/comply/internal/cli.Version=$(VERSION)"')
go build $(LDFLAGS) github.com/strongdm/comply/cmd/comply
dist: clean
$(eval VERSION := $(shell cat VERSION))
$(eval LDFLAGS := -ldflags='-X "cli.Version=$(VERSION)"')
mkdir dist
GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 go build -gcflags=-trimpath=$(GOPATH) -asmflags=-trimpath=$(GOPATH) $(LDFLAGS) -o dist/comply-$(VERSION)-darwin-amd64 github.com/strongdm/comply/cmd/comply
GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -gcflags=-trimpath=$(GOPATH) -asmflags=-trimpath=$(GOPATH) $(LDFLAGS) -o dist/comply-$(VERSION)-linux-amd64 github.com/strongdm/comply/cmd/comply
echo $(VERSION)
GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 go build -gcflags=-trimpath=$(GOPATH) -asmflags=-trimpath=$(GOPATH) $(LDFLAGS) -o dist/comply-$(VERSION)-darwin-amd64 ./cmd/comply
GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -gcflags=-trimpath=$(GOPATH) -asmflags=-trimpath=$(GOPATH) $(LDFLAGS) -o dist/comply-$(VERSION)-linux-amd64 ./cmd/comply
cd dist && tar -czvf comply-$(VERSION)-darwin-amd64.tgz comply-$(VERSION)-darwin-amd64
cd dist && tar -czvf comply-$(VERSION)-linux-amd64.tgz comply-$(VERSION)-linux-amd64
brew: clean assets $(GO_SOURCES)
$(eval VERSION := $(shell cat version))
$(eval LDFLAGS := -ldflags='-X "cli.Version=$(VERSION)"')
mkdir bin
GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 go build -gcflags=-trimpath=$(GOPATH) -asmflags=-trimpath=$(GOPATH) $(LDFLAGS) -o bin/comply ./cmd/comply
clean:
rm -rf bin
rm -rf dist
rm -f comply
@@ -46,6 +60,7 @@ cleanse:
git gc --aggressive --prune=all
release: dist release-deps
$(eval VERSION := $(shell git describe --tags --always --dirty="-dev"))
github-release release \
--security-token $$GH_LOGIN \
--user strongdm \
@@ -71,8 +86,15 @@ release: dist release-deps
patch-release: patch release
minor-release: minor release
patch: clean gitsem
gitsem patch
gitsem -m "increment patch for release" patch
git push
git push origin --tags
minor: clean gitsem
gitsem -m "increment minor for release" minor
git push
git push origin --tags

View File

@@ -1 +1 @@
1.0.8
1.1.6

22
comply.rb Normal file
View File

@@ -0,0 +1,22 @@
class Comply < Formula
desc ""
homepage ""
url "file:///Users/jmccarthy/Downloads/comply-1.1.3.tgz"
sha256 "01f9920e5e9fbd29386e4a4131fac78c002730e49c3f870a0ee2b958c3ce75f6"
depends_on "go" => :build
def install
ENV["GOPATH"] = buildpath
ENV.prepend_create_path "PATH", buildpath/"bin"
(buildpath/"src/github.com/strongdm/comply").install buildpath.children
cd "src/github.com/strongdm/comply" do
system "make", "brew"
bin.install "bin/comply"
end
end
test do
system "#{bin}/sdm", "logout"
end
end

View File

@@ -19,7 +19,7 @@ import (
)
// Version is set by the build system.
const Version = "0.0.0-development"
var Version = ""
// Main should be invoked by the main function in the main package.
func Main() {
@@ -32,7 +32,9 @@ func Main() {
func newApp() *cli.App {
app := cli.NewApp()
app.Name = "comply"
app.HideVersion = true
if Version == "" {
app.HideVersion = true
}
app.Version = Version
app.Usage = "policy compliance toolkit"