From bf9fedb3cf736c745720ad298a16423d81e349d1 Mon Sep 17 00:00:00 2001 From: Dan Bond Date: Fri, 12 Apr 2019 11:15:29 +0100 Subject: [PATCH] build: use go 1.12 (#124) * build: use go 1.12 * Update CHANGELOG.md --- .travis.yml | 2 +- CHANGELOG.md | 1 + Dockerfile | 2 +- configure | 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index f939d99..c5cdc33 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: go go: - - 1.10.x - 1.11.x + - 1.12.x install: # Fetch dependencies - wget -O dep https://github.com/golang/dep/releases/download/v0.5.0/dep-linux-amd64 diff --git a/CHANGELOG.md b/CHANGELOG.md index ddb6883..3efe7dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ - [#83](https://github.com/pusher/oauth2_proxy/pull/83) Add `id_token` refresh to Google provider (@leki75) - [#10](https://github.com/pusher/oauth2_proxy/pull/10) fix redirect url param handling (@dt-rush) - [#122](https://github.com/pusher/oauth2_proxy/pull/122) Expose -cookie-path as configuration parameter (@costelmoraru) +- [#124](https://github.com/pusher/oauth2_proxy/pull/124) Use Go 1.12 for testing and build environments (@syscll) # v3.1.0 diff --git a/Dockerfile b/Dockerfile index 2373897..4391434 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.11-stretch AS builder +FROM golang:1.12-stretch AS builder # Download tools RUN wget -O $GOPATH/bin/dep https://github.com/golang/dep/releases/download/v0.5.0/dep-linux-amd64 diff --git a/configure b/configure index 0e13959..24790ab 100755 --- a/configure +++ b/configure @@ -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.10 + vercomp $GO_VERSION 1.11 case $? in 0) ;& 1) @@ -91,7 +91,7 @@ check_go_version() { ;; 2) printf "${RED}" - echo "$GO_VERSION < 1.10" + echo "$GO_VERSION < 1.11" exit 1 ;; esac