feat(ci): add check to sure repo is go mod tidy and go work sync'd (

berachain#1090) * ree * x * x * x * x * bet
informalsystems · May 16, 2024 · cdd7e5e · cdd7e5e
1 parent 1df4c5e
commit cdd7e5e
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 6 deletions.
diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
@@ -55,6 +55,7 @@ jobs:
           - "nilaway"
           - "markdownlint"
           - "generate-check"
+          - "tidy-sync-check"
           - "test-unit-cover"
           - "test-unit-fuzz"
           - "test-forge-cover"

diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,6 @@
-[submodule "contracts/lib/forge-std"]
-	path = contracts/lib/forge-std
-	url = https://github.com/foundry-rs/forge-std
 [submodule "contracts/lib/solady"]
 	path = contracts/lib/solady
 	url = https://github.com/Vectorized/solady
+[submodule "contracts/lib/forge-std"]
+	path = contracts/lib/forge-std
+	url = https://github.com/foundry-rs/forge-std
diff --git a/build/scripts/devtools.mk b/build/scripts/devtools.mk
@@ -30,6 +30,14 @@ tidy: ## run go mod tidy in all modules
 yap: ## the yap cave
 	@go run ./mod/node-builder/pkg/utils/yap/yap.go
 
+tidy-sync-check:
+	@$(MAKE) tidy sync repo-rinse
+	@if [ -n "$$(git status --porcelain)" ]; then \
+		echo "Tidy and sync operations resulted in changes"; \
+		git status -s; \
+		git diff --exit-code; \
+	fi
+
 
 .PHONY: format build test-unit bet
 
diff --git a/contracts/lib/forge-std b/contracts/lib/forge-std
diff --git a/contracts/lib/solady b/contracts/lib/solady
diff --git a/mod/runtime/go.mod b/mod/runtime/go.mod
@@ -8,7 +8,6 @@ replace (
 	cosmossdk.io/x/auth => cosmossdk.io/x/auth v0.0.0-20240516114011-e03476679912
 	cosmossdk.io/x/consensus => cosmossdk.io/x/consensus v0.0.0-20240516114011-e03476679912
 	cosmossdk.io/x/gov => cosmossdk.io/x/gov v0.0.0-20240516114011-e03476679912
-
 	github.com/berachain/beacon-kit/mod/beacon => ../beacon
 
 	// Required because private repo, TODO: fix.
+6 −12		.github/workflows/ci.yml
+3 −1		.github/workflows/sync.yml
+2 −2		foundry.toml
+1 −1		package.json
+1 −1		src/StdAssertions.sol
+7 −7		src/StdChains.sol
+9 −3		src/StdInvariant.sol
+1 −1		src/StdUtils.sol
+113 −6		src/Vm.sol
+7 −7		test/StdChains.t.sol
+1 −1		test/StdCheats.t.sol
+2 −2		test/Vm.t.sol
+1,048 −990		.gas-snapshot
+6 −1		.github/workflows/ci.yml
+3 −0		.gitignore
+3 −0		README.md
+1 −1		package.json
+11 −6		src/Milady.sol
+209 −51		src/accounts/ERC1271.sol
+19 −2		src/accounts/ERC4337.sol
+59 −19		src/accounts/ERC6551.sol
+28 −23		src/utils/DeploylessPredeployQueryer.sol
+754 −3		src/utils/DynamicBufferLib.sol
+630 −0		src/utils/EnumerableSetLib.sol
+112 −66		src/utils/FixedPointMathLib.sol
+9 −8		src/utils/LibBit.sol
+305 −1		src/utils/LibClone.sol
+191 −0		src/utils/LibPRNG.sol
+1 −1		src/utils/LibSort.sol
+3 −3		src/utils/LibString.sol
+97 −0		src/utils/P256.sol
+284 −97		src/utils/SafeCastLib.sol
+1 −1		src/utils/UUPSUpgradeable.sol
+190 −0		src/utils/UpgradeableBeacon.sol
+47 −28		test/DeploylessPredeployQueryer.t.sol
+136 −0		test/DynamicBufferLib.t.sol
+315 −0		test/ERC1271.t.sol
+5 −1		test/ERC20.t.sol
+121 −60		test/ERC4337.t.sol
+177 −124		test/ERC4626.t.sol
+78 −53		test/ERC6551.t.sol
+647 −0		test/EnumerableSetLib.t.sol
+182 −12		test/FixedPointMathLib.t.sol
+156 −8		test/LibClone.t.sol
+0 −10		test/LibERC6551.t.sol
+245 −0		test/LibPRNG.t.sol
+25 −14		test/OwnableRoles.t.sol
+95 −0		test/P256.t.sol
+919 −199		test/SafeCastLib.t.sol
+0 −7		test/SafeTransferLib.t.sol
+197 −0		test/UpgradeableBeacon.t.sol
+184 −0		test/utils/Brutalizer.sol
+13 −160		test/utils/TestPlus.sol
+720 −93		test/utils/forge-std/Test.sol
+1,826 −366		test/utils/forge-std/Vm.sol
+0 −517		test/utils/forge-std/ds-test/test.sol
+2 −8		test/utils/mocks/MockERC1155.sol
+2 −8		test/utils/mocks/MockERC20.sol
+2 −15		test/utils/mocks/MockERC2981.sol
+2 −8		test/utils/mocks/MockERC4337.sol
+21 −8		test/utils/mocks/MockERC6551.sol
+2 −8		test/utils/mocks/MockERC6909.sol
+2 −15		test/utils/mocks/MockERC721.sol
+8 −20		test/utils/mocks/MockOwnable.sol
+14 −26		test/utils/mocks/MockOwnableRoles.sol
+2 −8		test/utils/mocks/MockUUPSImplementation.sol