From 6438200b8987b4ab8aa6edf99010e6750b87f9bd Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Tue, 16 Jul 2024 20:17:18 +0200
Subject: [PATCH] user: require go1.21 or higher

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 Makefile    | 8 ++++++--
 user/go.mod | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 14e79bd9..3f7dad40 100644
--- a/Makefile
+++ b/Makefile
@@ -16,14 +16,18 @@ clean:
 test: test-local
 	set -eu; \
 	for p in $(PACKAGES); do \
-		(cd $$p; go test $(RUN_VIA_SUDO) -v .); \
+		if $p = user && go version | grep -qv go1.17; then \
+			(cd $$p; go test $(RUN_VIA_SUDO) -v .); \
+		fi \
 	done
 
 .PHONY: tidy
 tidy:
 	set -eu; \
 		for p in $(PACKAGES); do \
-		(cd $$p; go mod tidy); \
+			if $p = user && go version | grep -qv go1.17; then \
+				(cd $$p; go mod tidy); \
+			fi \
 	done
 
 # Test the mount module against the local mountinfo source code instead of the
diff --git a/user/go.mod b/user/go.mod
index 1c62fac9..d4ad72f8 100644
--- a/user/go.mod
+++ b/user/go.mod
@@ -1,5 +1,5 @@
 module github.com/moby/sys/user
 
-go 1.17
+go 1.21
 
 require golang.org/x/sys v0.1.0