Merge pull request #13 from pusher/release-3.0.0

Release 3.0.0

CHANGELOG.md

@@ -1,23 +1,32 @@
 # Vx.x.x (Pre-release)
 
+## Changes since v3.0.0
+
+# v3.0.0
+
+Adoption of OAuth2_Proxy by Pusher.
+Project was hard forked and tidied however no logical changes have occurred since
+v2.2 as released by Bitly.
+
 ## Changes since v2.2:
 
-- Move automated build to debian base image
-- Add Makefile
+- [#7](https://github.com/pusher/oauth2_proxy/pull/7) Migration to Pusher (@joelspeed)
+  - Move automated build to debian base image
+  - Add Makefile
     - Update CI to run `make test`
     - Update Dockerfile to use `make clean oauth2_proxy`
     - Update `VERSION` parameter to be set by `ldflags` from Git Status
     - Remove lint and test scripts
-- Remove Go v1.8.x from Travis CI testing
-- Add CODEOWNERS file
-- Add CONTRIBUTING guide
-- Add Issue and Pull Request templates
-- Add Dockerfile
-- Fix fsnotify import
-- Update README to reflect new repository ownership
-- Update CI scripts to separate linting and testing
+  - Remove Go v1.8.x from Travis CI testing
+  - Add CODEOWNERS file
+  - Add CONTRIBUTING guide
+  - Add Issue and Pull Request templates
+  - Add Dockerfile
+  - Fix fsnotify import
+  - Update README to reflect new repository ownership
+  - Update CI scripts to separate linting and testing
     - Now using `gometalinter` for linting
-- Move Go import path from `github.com/bitly/oauth2_proxy` to `github.com/pusher/oauth2_proxy`
-- Repository forked on 27/11/18
+  - Move Go import path from `github.com/bitly/oauth2_proxy` to `github.com/pusher/oauth2_proxy`
+  - Repository forked on 27/11/18
     - README updated to include note that this repository is forked
     - CHANGLOG created to track changes to repository from original fork

Makefile

@@ -54,3 +54,10 @@ release: lint test
 	mkdir release
 	GOOS=darwin GOARCH=amd64 go build -ldflags="-X main.VERSION=${VERSION}" -o release/$(BINARY)-darwin-amd64 github.com/pusher/oauth2_proxy
 	GOOS=linux GOARCH=amd64 go build -ldflags="-X main.VERSION=${VERSION}" -o release/$(BINARY)-linux-amd64 github.com/pusher/oauth2_proxy
+	GOOS=windows GOARCH=amd64 go build -ldflags="-X main.VERSION=${VERSION}" -o release/$(BINARY)-windows-amd64 github.com/pusher/oauth2_proxy
+	shasum -a 256 release/$(BINARY)-darwin-amd64 > release/$(BINARY)-darwin-amd64-sha256sum.txt
+	shasum -a 256 release/$(BINARY)-linux-amd64 > release/$(BINARY)-linux-amd64-sha256sum.txt
+	shasum -a 256 release/$(BINARY)-windows-amd64 > release/$(BINARY)-windows-amd64-sha256sum.txt
+	tar -cvf release/$(BINARY)-$(VERSION).darwin-amd64.$(GO_VERSION).tar.gz release/$(BINARY)-darwin-amd64
+	tar -cvf release/$(BINARY)-$(VERSION).linux-amd64.$(GO_VERSION).tar.gz release/$(BINARY)-linux-amd64
+	tar -cvf release/$(BINARY)-$(VERSION).windows-amd64.$(GO_VERSION).tar.gz release/$(BINARY)-windows-amd64

README.md

@@ -19,17 +19,17 @@ A list of changes can be seen in the [CHANGELOG](CHANGELOG.md).
 
 1.  Choose how to deploy:
 
-    a. Download [Prebuilt Binary](https://github.com/pusher/oauth2_proxy/releases) (current release is `v2.2`)
+    a. Download [Prebuilt Binary](https://github.com/pusher/oauth2_proxy/releases) (current release is `v3.0.0`)
 
     b. Build with `$ go get github.com/pusher/oauth2_proxy` which will put the binary in `$GOROOT/bin`
 
     c. Using the prebuilt docker image [quay.io/pusher/oauth2_proxy](https://quay.io/pusher/oauth2_proxy)
 
-Prebuilt binaries can be validated by extracting the file and verifying it against the `sha256sum.txt` checksum file provided for each release starting with version `v2.3`.
+Prebuilt binaries can be validated by extracting the file and verifying it against the `sha256sum.txt` checksum file provided for each release starting with version `v3.0.0`.
 
 ```
 sha256sum -c sha256sum.txt 2>&1 | grep OK
-oauth2_proxy-2.3.linux-amd64: OK
+oauth2_proxy-3.0.0.linux-amd64: OK
 ```
 
 2.  Select a Provider and Register an OAuth Application with a Provider

configure

@@ -95,6 +95,8 @@ check_go_version() {
       exit 1
       ;;
   esac
+  VERSION=$(${tools[go]} version | ${tools[awk]} '{print $3}')
+  tools["go_version"]="${VERSION}"
 }
 
 check_docker_version() {
@@ -129,6 +131,7 @@ echo
 cat <<- EOF > .env
 	MAKE := "${tools[make]}"
   GO := "${tools[go]}"
+  GO_VERSION := ${tools[go_version]}
   DEP := "${tools[dep]}"
 EOF