Merge branch 'master' into joerger/fix-sso-backwards-comp

gravitational · Jun 16, 2022 · 1be4234 · 1be4234
2 parents ef554a1 + 14ebab8
commit 1be4234
Show file tree

Hide file tree

Showing 4 changed files with 155 additions and 9 deletions.
diff --git a/build.assets/Makefile b/build.assets/Makefile
@@ -18,7 +18,7 @@ OS ?= linux
 ARCH ?= amd64
 BUILDBOX_VERSION ?= teleport11
 GOLANG_VERSION ?= go1.18.3
-RUST_VERSION ?= 1.61.0
+RUST_VERSION ?= 1.58.1 # don't bump this without checking GLIBC compatibility
 NODE_VERSION ?= 16.13.2
 BORINGCRYPTO_RUNTIME=$(GOLANG_VERSION)b7
 LIBBPF_VERSION ?= 0.7.0-teleport