luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1622 from alixander/docker-go

Browse source 
bump go version in docker
This commit is contained in:
Alexander Wang 2023-09-26 11:38:49 -07:00 committed by GitHub
commit 5f140819fd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ci/release/build_in_docker.sh
View file

@ -4,7 +4,7 @@ cd -- "$(dirname "$0")/../.."
. ./ci/sub/lib.sh . ./ci/sub/lib.sh
tag="$(sh_c docker build \ tag="$(sh_c docker build \
--build-arg GOVERSION="1.19.3.linux-$ARCH" \ --build-arg GOVERSION="1.20.8.linux-$ARCH" \
-qf ./ci/release/linux/Dockerfile ./ci/release/linux)" -qf ./ci/release/linux/Dockerfile ./ci/release/linux)"
docker_run \ docker_run \
-e DRY_RUN \ -e DRY_RUN \

1
d2plugin/plugin.go
View file

@ -152,7 +152,6 @@ func ListPluginInfos(ctx context.Context, ps []Plugin) ([]*PluginInfo, error) {
// 1. It first searches the bundled plugins in the global plugins slice. // 1. It first searches the bundled plugins in the global plugins slice.
// 2. If not found, it then searches each directory in $PATH for a binary with the name // 2. If not found, it then searches each directory in $PATH for a binary with the name
// d2plugin-<name>. // d2plugin-<name>.
// **NOTE** When D2 upgrades to go 1.19, remember to ignore exec.ErrDot
// 3. If such a binary is found, it builds an execPlugin in exec.go // 3. If such a binary is found, it builds an execPlugin in exec.go
// to get a plugin implementation around the binary and returns it. // to get a plugin implementation around the binary and returns it.
func FindPlugin(ctx context.Context, ps []Plugin, name string) (Plugin, error) { func FindPlugin(ctx context.Context, ps []Plugin, name string) (Plugin, error) {