Skip to content

Commit 183f6c1

Browse files
committed
chore: fix go mod upgrades
Remove Go v1.18 compat since we have not been supporting it for a while. Also include test dependencies in upgrades to pass CI. Signed-off-by: Michael Gasch <[email protected]>
1 parent 8b59a2b commit 183f6c1

6 files changed

+7
-7
lines changed

hack/conformance-test.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ pushd ./test/conformance
1313
go test --tags=conformance -v -timeout 15s
1414

1515
# Remove test only deps.
16-
go mod tidy -compat=1.18
16+
go mod tidy
1717
popd

hack/go-mod-tidy.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ set -o errexit
77
set -o nounset
88
set -o pipefail
99

10-
for gomodule in $(find . | grep "go\.mod" | awk '{gsub(/\/go.mod/,""); print $0}' | grep -v "./test" | grep -v "./conformance")
10+
for gomodule in $(find . | grep "go\.mod" | awk '{gsub(/\/go.mod/,""); print $0}' | grep -v "./conformance")
1111
do
1212
pushd $gomodule
13-
go mod tidy -compat=1.18
13+
go mod tidy
1414
popd
1515
done

hack/integration-test.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ done
2727
rm coverage.tmp
2828

2929
# Remove test only deps.
30-
go mod tidy -compat=1.18
30+
go mod tidy
3131

3232
popd

hack/observability-test.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ done
2626
rm coverage.tmp
2727

2828
# Remove test only deps.
29-
go mod tidy -compat=1.18
29+
go mod tidy
3030

3131
popd

hack/tag-release.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ do
121121
go get -d $repoint@$tag
122122
go mod edit -dropreplace $repoint
123123
fi
124-
go mod tidy -compat=1.18
124+
go mod tidy
125125
done
126126
popd > /dev/null
127127

hack/unit-test.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ do
2525

2626
rm coverage.tmp
2727
# Remove test only deps.
28-
go mod tidy -compat=1.18
28+
go mod tidy
2929
popd
3030
done

0 commit comments

Comments
 (0)