From 156e59ccd1d8305fc8df19352935f46a19bf96ed Mon Sep 17 00:00:00 2001
From: Casey Callendrello <cdc@redhat.com>
Date: Wed, 11 Aug 2021 17:15:56 +0200
Subject: [PATCH] bump go to 1.16, other misc fixes

- add selinux relabling to release.sh
- use same go version in root

Signed-off-by: Casey Callendrello <cdc@redhat.com>
---
 .github/workflows/test.yaml | 6 +++++-
 scripts/release.sh          | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 85b983ecb..63c014e75 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -4,7 +4,7 @@ name: test
 on: ["push", "pull_request"]
 
 env:
-  GO_VERSION: "1.15"
+  GO_VERSION: "1.16"
   LINUX_ARCHES: "amd64 386 arm arm64 s390x mips64le ppc64le"
 
 jobs:
@@ -39,6 +39,10 @@ jobs:
         uses: actions/setup-go@v2
         with:
           go-version: ${{ env.GO_VERSION }}
+      - name: Set up Go for root
+        run: |
+          sudo ln -sf `which go` `sudo which go` || true
+          sudo go version
       - uses: actions/checkout@v2
 
       - name: Install test binaries
diff --git a/scripts/release.sh b/scripts/release.sh
index 351698d3b..da6540509 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -16,7 +16,7 @@ rm -Rf ${SRC_DIR}/${RELEASE_DIR}
 mkdir -p ${SRC_DIR}/${RELEASE_DIR}
 mkdir -p ${OUTPUT_DIR}
 
-$DOCKER run -ti -v ${SRC_DIR}:/go/src/github.com/containernetworking/plugins --rm golang:1.15-alpine \
+$DOCKER run -ti -v ${SRC_DIR}:/go/src/github.com/containernetworking/plugins:z --rm golang:1.16-alpine \
 /bin/sh -xe -c "\
     apk --no-cache add bash tar;
     cd /go/src/github.com/containernetworking/plugins; umask 0022;