From d2a0f9957454e73cca88f628060713fb8f0be5bb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Apr 2024 13:02:32 -0500
Subject: [PATCH 1/2] Bump the actions group with 2 updates (#1613)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ab05fafebe..c4e5498fbf 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -17,5 +17,5 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
-      - uses: pre-commit/action@v3.0.0
+      - uses: actions/setup-python@v5
+      - uses: pre-commit/action@v3.0.1

From 0a49689e71b749aba87d20aee77b55774f2632a9 Mon Sep 17 00:00:00 2001
From: Matt Dale <9760375+matthewdale@users.noreply.github.com>
Date: Thu, 25 Apr 2024 14:49:33 -0700
Subject: [PATCH 2/2] Run `go mod tidy` before vendoring in compilecheck.
 (#1620)

---
 etc/compile_check.sh | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/etc/compile_check.sh b/etc/compile_check.sh
index 3815d19f3a..397322f2bf 100755
--- a/etc/compile_check.sh
+++ b/etc/compile_check.sh
@@ -20,19 +20,18 @@ function compile_check {
 	# Change the directory to the compilecheck test directory.
 	cd ${COMPILE_CHECK_DIR}
 
+	# If the Go version is 1.15 or greater, then run "go mod tidy".
+	MACHINE_VERSION=`${GC} version | { read _ _ v _; echo ${v#go}; }`
+	if [ $(version $MACHINE_VERSION) -ge $(version 1.15) ]; then
+		go mod tidy
+	fi
+
 	# Test vendoring
 	go mod vendor
 	${GC} build -mod=vendor
 
 	rm -rf vendor
 
-	MACHINE_VERSION=`${GC} version | { read _ _ v _; echo ${v#go}; }`
-
-	# If the version is not 1.13, then run "go mod tidy"
-	if [ $(version $MACHINE_VERSION) -ge $(version 1.15) ]; then
-		go mod tidy
-	fi
-
 	# Check simple build.
 	${GC} build ./...