Skip to content

Commit 1fb5bf6

Browse files
authored
Merge pull request #982 from jingyuanliang/patch-1
Bump to golang:1.21-alpine in release.sh
2 parents 3712c1c + d708217 commit 1fb5bf6

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

.github/workflows/test.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ name: test
44
on: ["push", "pull_request"]
55

66
env:
7-
GO_VERSION: "1.20"
7+
GO_VERSION: "1.21"
88
LINUX_ARCHES: "amd64 386 arm arm64 s390x mips64le ppc64le riscv64"
99

1010
jobs:

scripts/release.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ set -xe
33

44
SRC_DIR="${SRC_DIR:-$PWD}"
55
DOCKER="${DOCKER:-docker}"
6+
GOLANG="${GOLANG:-golang:1.21-alpine}"
67

78
TAG=$(git describe --tags --dirty)
89
RELEASE_DIR=release-${TAG}
@@ -16,7 +17,7 @@ rm -Rf ${SRC_DIR}/${RELEASE_DIR}
1617
mkdir -p ${SRC_DIR}/${RELEASE_DIR}
1718
mkdir -p ${OUTPUT_DIR}
1819

19-
$DOCKER run -ti -v ${SRC_DIR}:/go/src/github.com/containernetworking/plugins:z --rm golang:1.20-alpine \
20+
$DOCKER run -ti -v ${SRC_DIR}:/go/src/github.com/containernetworking/plugins:z --rm "${GOLANG}" \
2021
/bin/sh -xe -c "\
2122
apk --no-cache add bash tar;
2223
cd /go/src/github.com/containernetworking/plugins; umask 0022;

0 commit comments

Comments
 (0)