Skip to content

Commit

Permalink
Bump to golang:1.21-alpine in release.sh
Browse files Browse the repository at this point in the history
Also make this overridable in env vars.

Signed-off-by: Jingyuan Liang <[email protected]>
  • Loading branch information
jingyuanliang committed Nov 17, 2023
1 parent abee8cc commit d708217
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: test
on: ["push", "pull_request"]

env:
GO_VERSION: "1.20"
GO_VERSION: "1.21"
LINUX_ARCHES: "amd64 386 arm arm64 s390x mips64le ppc64le riscv64"

jobs:
Expand Down
3 changes: 2 additions & 1 deletion scripts/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ set -xe

SRC_DIR="${SRC_DIR:-$PWD}"
DOCKER="${DOCKER:-docker}"
GOLANG="${GOLANG:-golang:1.21-alpine}"

TAG=$(git describe --tags --dirty)
RELEASE_DIR=release-${TAG}
Expand All @@ -16,7 +17,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:z --rm golang:1.20-alpine \
$DOCKER run -ti -v ${SRC_DIR}:/go/src/github.com/containernetworking/plugins:z --rm "${GOLANG}" \
/bin/sh -xe -c "\
apk --no-cache add bash tar;
cd /go/src/github.com/containernetworking/plugins; umask 0022;
Expand Down

0 comments on commit d708217

Please sign in to comment.