From e9fb0b0a9781f39530501f35938370ed2d7f0816 Mon Sep 17 00:00:00 2001 From: Daniel Fuentes Date: Thu, 16 Nov 2017 12:54:34 -0800 Subject: [PATCH] Update makefile and readme instructions for mac release --- Makefile | 17 +++++++++++------ README.md | 9 +++++++++ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 9c97c7b0..135484b8 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,6 @@ version := $$CIRCLE_TAG release: gh-release govendor clean dist - govendor sync github-release release \ --security-token $$GH_LOGIN \ --user segmentio \ @@ -14,25 +13,31 @@ release: gh-release govendor clean dist --user segmentio \ --repo aws-okta \ --tag $(version) \ - --name aws-okta-$(version)-darwin-amd64 \ - --file dist/aws-okta-$(version)-darwin-amd64 + --name aws-okta-$(version)-linux-amd64 \ + --file dist/aws-okta-$(version)-linux-amd64 +release-mac: gh-release govendor clean dist-mac github-release upload \ --security-token $$GH_LOGIN \ --user segmentio \ --repo aws-okta \ --tag $(version) \ - --name aws-okta-$(version)-linux-amd64 \ - --file dist/aws-okta-$(version)-linux-amd64 + --name aws-okta-$(version)-darwin-amd64 \ + --file dist/aws-okta-$(version)-darwin-amd64 clean: rm -rf ./dist dist: mkdir dist - GOOS=darwin GOARCH=amd64 go build -o dist/aws-okta-$(version)-darwin-amd64 + govendor sync GOOS=linux GOARCH=amd64 go build -o dist/aws-okta-$(version)-linux-amd64 +dist-mac: + mkdir dist + govendor sync + GOOS=darwin GOARCH=amd64 go build -o dist/aws-okta-$(version)-darwin-amd64 + gh-release: go get -u github.com/aktau/github-release diff --git a/README.md b/README.md index 9734e86c..95c465a6 100644 --- a/README.md +++ b/README.md @@ -69,6 +69,15 @@ Your setup may require additional roles to be configured if your admin has set u We use 99design's keyring package that they use in `aws-vault`. Because of this, you can choose between different pluggable secret storage backends just like in `aws-vault`. You can either set your backend from the command line as a flag, or set the `AWS_OKTA_BACKEND` environment variable. +## Releasing + +Pushing a new tag will cause Circle to automatically create and push a linux release. After this is done, you shoule run (from a mac): + +```bash +$ export CIRCLE_TAG=`git describe --tags` +$ make release-mac +``` + ## Internals ### Authentication process