mirror of
https://github.com/oauth2-proxy/oauth2-proxy.git
synced 2025-06-04 23:37:29 +02:00
Bump golang to 1.19 and min allowed version to 1.18
This commit is contained in:
parent
19bb0d0e86
commit
b3df9aecc2
4
.github/workflows/ci.yaml
vendored
4
.github/workflows/ci.yaml
vendored
@ -20,10 +20,10 @@ jobs:
|
|||||||
- name: Check out code
|
- name: Check out code
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v2
|
||||||
|
|
||||||
- name: Set up Go 1.18
|
- name: Set up Go 1.19
|
||||||
uses: actions/setup-go@v2
|
uses: actions/setup-go@v2
|
||||||
with:
|
with:
|
||||||
go-version: 1.18.x
|
go-version: 1.19.x
|
||||||
id: go
|
id: go
|
||||||
|
|
||||||
- name: Get dependencies
|
- name: Get dependencies
|
||||||
|
@ -5,7 +5,7 @@ ARG RUNTIME_IMAGE=alpine:3.16
|
|||||||
# cache sharing of the go mod download step.
|
# cache sharing of the go mod download step.
|
||||||
# Go cross compilation is also faster than emulation the go compilation across
|
# Go cross compilation is also faster than emulation the go compilation across
|
||||||
# multiple platforms.
|
# multiple platforms.
|
||||||
FROM --platform=${BUILDPLATFORM} golang:1.18-buster AS builder
|
FROM --platform=${BUILDPLATFORM} golang:1.19-buster AS builder
|
||||||
|
|
||||||
# Copy sources
|
# Copy sources
|
||||||
WORKDIR $GOPATH/src/github.com/oauth2-proxy/oauth2-proxy
|
WORKDIR $GOPATH/src/github.com/oauth2-proxy/oauth2-proxy
|
||||||
|
2
Makefile
2
Makefile
@ -10,7 +10,7 @@ REGISTRY ?= quay.io/oauth2-proxy
|
|||||||
GO_MAJOR_VERSION = $(shell $(GO) version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f1)
|
GO_MAJOR_VERSION = $(shell $(GO) version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f1)
|
||||||
GO_MINOR_VERSION = $(shell $(GO) version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f2)
|
GO_MINOR_VERSION = $(shell $(GO) version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f2)
|
||||||
MINIMUM_SUPPORTED_GO_MAJOR_VERSION = 1
|
MINIMUM_SUPPORTED_GO_MAJOR_VERSION = 1
|
||||||
MINIMUM_SUPPORTED_GO_MINOR_VERSION = 15
|
MINIMUM_SUPPORTED_GO_MINOR_VERSION = 18
|
||||||
GO_VERSION_VALIDATION_ERR_MSG = Golang version is not supported, please update to at least $(MINIMUM_SUPPORTED_GO_MAJOR_VERSION).$(MINIMUM_SUPPORTED_GO_MINOR_VERSION)
|
GO_VERSION_VALIDATION_ERR_MSG = Golang version is not supported, please update to at least $(MINIMUM_SUPPORTED_GO_MAJOR_VERSION).$(MINIMUM_SUPPORTED_GO_MINOR_VERSION)
|
||||||
|
|
||||||
ifeq ($(COVER),true)
|
ifeq ($(COVER),true)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user