Get embedded-bins go_version from go.mod

Signed-off-by: Kimmo Lehto <[email protected]>
k0sproject · Jan 11, 2024 · cc562b6 · cc562b6
1 parent 5ff8b47
commit cc562b6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/embedded-bins/Makefile.variables b/embedded-bins/Makefile.variables
@@ -1,7 +1,7 @@
 alpine_version = 3.19
 alpine_patch_version = $(alpine_version).0
 golang_buildimage=docker.io/library/golang:$(go_version)-alpine$(alpine_version)
-go_version = 1.21.6
+go_version = $(shell grep -E "^toolchain go" ../go.mod | grep -oE "[0-9.]+$$" || grep -E "^go " ../go.mod | grep -oE "[0-9.]+$$")
 
 runc_version = 1.1.11
 runc_buildimage = $(golang_buildimage)

diff --git a/vars.sh b/vars.sh
@@ -41,8 +41,8 @@ done
 [ -n "$var" ] || fail Makefile variable not given
 [ -n "$from" ] || from=embedded-bins
 
-exec make --no-print-directory -r -s -f - <<EOF
-include $from/Makefile.variables
+exec make -C "$from" --no-print-directory -r -s -f - <<EOF
+include Makefile.variables
 
 .PHONY: print
 print: