Skip to content

Commit

Permalink
user: require go1.21 or higher
Browse files Browse the repository at this point in the history
Signed-off-by: Sebastiaan van Stijn <[email protected]>
  • Loading branch information
thaJeztah committed Jul 24, 2024
1 parent a40602b commit 5cd502c
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 7 deletions.
18 changes: 12 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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.18; 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); \
for p in $(PACKAGES); do \
if $p = user && go version | grep -qv go1.18; then \
(cd $$p; go mod tidy); \
fi \
done

# Test the mount module against the local mountinfo source code instead of the
Expand All @@ -42,9 +46,11 @@ lint: $(BINDIR)/golangci-lint
$(BINDIR)/golangci-lint version
set -eu; \
for p in $(PACKAGES); do \
(cd $$p; \
go mod download; \
../$(BINDIR)/golangci-lint run); \
if $p = user && go version | grep -qv go1.18; then \
(cd $$p; \
go mod download; \
../$(BINDIR)/golangci-lint run); \
fi \
done

$(BINDIR)/golangci-lint: $(BINDIR)
Expand Down
2 changes: 1 addition & 1 deletion user/go.mod
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module github.com/moby/sys/user

go 1.18
go 1.21

This comment has been minimized.

Copy link
@tianon

tianon Jul 25, 2024

Member

Can you explain this one? I read through the PR and the only relevant comment I could find was that you didn't want to do this in this 😅


require golang.org/x/sys v0.1.0

0 comments on commit 5cd502c

Please sign in to comment.