Merge remote-tracking branch 'origin/master' into circuitbreaker

9seconds · Feb 25, 2021 · 94f2d22 · 94f2d22
2 parents f3035e9 + 2318113
commit 94f2d22
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -27,7 +27,8 @@ jobs:
       matrix:
         go_version:
           - ~1.14
-          - ^1.15
+          - ~1.15
+          - ^1.16
     steps:
       - name: Checkout
         uses: actions/checkout@v2

diff --git a/Dockerfile b/Dockerfile
@@ -6,12 +6,13 @@
 ###############################################################################
 # BUILD STAGE
 
-FROM golang:1.15-alpine AS build-env
+FROM golang:1.16-alpine AS build-env
 
 ENV CGO_ENABLED=0
 
 RUN set -x \
   && apk --update add \
+    bash \
     ca-certificates \
     git \
     make
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,7 +27,8 @@ jobs: @@
           matrix:
             go_version:
               - ~1.14
-              - ^1.15
+              - ~1.15
+              - ^1.16
         steps:
           - name: Checkout
             uses: actions/checkout@v2
@@ Expand Down @@