Skip to content

Commit

Permalink
Merge pull request oauth2-proxy#463 from pusher/release-5.1.0
Browse files Browse the repository at this point in the history
Update Changelog for Release 5.1.0
  • Loading branch information
JoelSpeed authored Mar 29, 2020
2 parents 362cdf7 + 9dcd825 commit 4cdedc8
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 13 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
language: go
go:
- 1.13.x
- 1.14.x
install:
# Fetch dependencies
- curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $GOPATH/bin v1.23.6
- curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $GOPATH/bin v1.24.0
- GO111MODULE=on go mod download
script:
- ./configure && make test
Expand Down
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,25 @@

## Release Hightlights

## Important Notes

## Breaking Changes

## Changes since v5.1.0

# v5.1.0

## Release Hightlights
- Bump to Go 1.14
- Reduced number of Google API requests for group validation
- Support for Redis Cluster
- Support for overriding hosts in hosts file

## Important Notes
- [#335] The session expiry for the OIDC provider is now taken from the Token Response (expires_in) rather than from the id_token (exp)

## Breaking Changes
N/A

## Changes since v5.0.0

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM golang:1.14-buster AS builder

# Download tools
RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.23.6
RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.24.0

# Copy sources
WORKDIR $GOPATH/src/github.com/pusher/oauth2_proxy
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.arm64
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM golang:1.14-buster AS builder

# Download tools
RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.23.6
RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.24.0

# Copy sources
WORKDIR $GOPATH/src/github.com/pusher/oauth2_proxy
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.armv6
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM golang:1.14-buster AS builder

# Download tools
RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.23.6
RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.24.0

# Copy sources
WORKDIR $GOPATH/src/github.com/pusher/oauth2_proxy
Expand Down
8 changes: 4 additions & 4 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ GREEN='\033[0;32m'
BLUE='\033[0;34m'
NC='\033[0m'

if [ -z "${BASH_VERSINFO}" ] || [ -z "${BASH_VERSINFO[0]}" ] || [ ${BASH_VERSINFO[0]} -lt 4 ]; then
echo "This script requires Bash version >= 4"; exit 1;
if [ -z "${BASH_VERSINFO}" ] || [ -z "${BASH_VERSINFO[0]}" ] || [ ${BASH_VERSINFO[0]} -lt 4 ]; then
echo "This script requires Bash version >= 4"; exit 1;
fi

declare -A tools=()
Expand Down Expand Up @@ -81,7 +81,7 @@ check_for() {
check_go_version() {
echo -n "Checking go version... "
GO_VERSION=$(${tools[go]} version | ${tools[awk]} '{where = match($0, /[0-9]\.[0-9]+\.[0-9]*/); if (where != 0) print substr($0, RSTART, RLENGTH)}')
vercomp $GO_VERSION 1.12
vercomp $GO_VERSION 1.14
case $? in
0) ;&
1)
Expand All @@ -91,7 +91,7 @@ check_go_version() {
;;
2)
printf "${RED}"
echo "$GO_VERSION < 1.12"
echo "$GO_VERSION < 1.14"
exit 1
;;
esac
Expand Down
6 changes: 3 additions & 3 deletions dist.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ if [[ -z ${BINARY} ]] || [[ -z ${VERSION} ]]; then
exit 1
fi

# Check for Go version 1.13.*
# Check for Go version 1.14.*
GO_VERSION=$(go version | awk '{print $3}')
if [[ ! "${GO_VERSION}" =~ ^go1.13.* ]]; then
echo "Go version must be >= go1.13"
if [[ ! "${GO_VERSION}" =~ ^go1.14.* ]]; then
echo "Go version must be >= go1.14"
exit 1
fi

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/pusher/oauth2_proxy

go 1.13
go 1.14

require (
github.com/BurntSushi/toml v0.3.1
Expand Down

0 comments on commit 4cdedc8

Please sign in to comment.