From db6b3d2b67494b726d3ab7e4da548a2bfb2678ad Mon Sep 17 00:00:00 2001
From: lgtm <1gtm@users.noreply.github.com>
Date: Tue, 22 Sep 2020 22:20:36 -0700
Subject: [PATCH] [cherry-pick] Update repository config (#339) (#345)

/cherry-pick

Signed-off-by: 1gtm <1gtm@appscode.com>
---
 .github/workflows/ci.yml | 4 ++--
 Makefile                 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index dc68e04bc..5f67eefea 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,10 +13,10 @@ jobs:
     name: Build
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go 1.14
+      - name: Set up Go 1.15
         uses: actions/setup-go@v1
         with:
-          go-version: 1.14
+          go-version: 1.15
         id: go
 
       - uses: actions/checkout@v1
diff --git a/Makefile b/Makefile
index a33afc28f..30a744768 100644
--- a/Makefile
+++ b/Makefile
@@ -76,7 +76,7 @@ TAG              := $(VERSION)_$(OS)_$(ARCH)
 TAG_PROD         := $(TAG)
 TAG_DBG          := $(VERSION)-dbg_$(OS)_$(ARCH)
 
-GO_VERSION       ?= 1.14
+GO_VERSION       ?= 1.15
 BUILD_IMAGE      ?= appscode/golang-dev:$(GO_VERSION)
 CHART_TEST_IMAGE ?= quay.io/helmpack/chart-testing:v3.0.0-rc.1