From ff93fe15067a30d183368c3515898ec635675645 Mon Sep 17 00:00:00 2001 From: maskpp Date: Tue, 20 Aug 2024 16:59:57 +0800 Subject: [PATCH 1/2] open container logs and close build image logs --- .github/workflows/taiko-client--hive_test.yml | 2 +- go.mod | 2 +- go.sum | 4 ++-- packages/taiko-client/integration_test/hive_test.go | 9 +++++---- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/taiko-client--hive_test.yml b/.github/workflows/taiko-client--hive_test.yml index 5afcbb9acdb..ba20e9289a9 100644 --- a/.github/workflows/taiko-client--hive_test.yml +++ b/.github/workflows/taiko-client--hive_test.yml @@ -2,7 +2,7 @@ name: "Taiko Client Hive Tests" on: push: - branches: [main] + branches: [hive_test_logs_] paths: - "packages/taiko-client/**" - "go.mod" diff --git a/go.mod b/go.mod index 00cbcbacc69..b104fde8b17 100644 --- a/go.mod +++ b/go.mod @@ -338,4 +338,4 @@ replace github.com/ethereum-optimism/optimism v1.7.4 => github.com/taikoxyz/opti replace github.com/uber/jaeger-client-go => github.com/uber/jaeger-client-go v2.25.0+incompatible -replace github.com/ethereum/hive v0.0.0-20240819211657-cf4f55c5d80c => github.com/taikoxyz/hive v0.0.0-20240820040114-cbd376215f38 +replace github.com/ethereum/hive v0.0.0-20240819211657-cf4f55c5d80c => github.com/taikoxyz/hive v0.0.0-20240820085424-18828a3c52ee diff --git a/go.sum b/go.sum index 325b537ad21..634d57e046c 100644 --- a/go.sum +++ b/go.sum @@ -1175,8 +1175,8 @@ github.com/swaggo/swag v1.16.3/go.mod h1:DImHIuOFXKpMFAQjcC7FG4m3Dg4+QuUgUzJmKjI github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc= github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d h1:vfofYNRScrDdvS342BElfbETmL1Aiz3i2t0zfRj16Hs= github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d/go.mod h1:RRCYJbIwD5jmqPI9XoAFR0OcDxqUctll6zUj/+B4S48= -github.com/taikoxyz/hive v0.0.0-20240820040114-cbd376215f38 h1:7fAvFrUftT27NBvDwledwGaT0tStIpF6hq7vwoHuTFU= -github.com/taikoxyz/hive v0.0.0-20240820040114-cbd376215f38/go.mod h1:SRnVApayESg4JOlUIojO1nKNG8BLxdpZSkewWrj6rYU= +github.com/taikoxyz/hive v0.0.0-20240820085424-18828a3c52ee h1:/TbK2Ui8YJveJDQexkvchBOL4uX8HILThARQNZ9aEtU= +github.com/taikoxyz/hive v0.0.0-20240820085424-18828a3c52ee/go.mod h1:SRnVApayESg4JOlUIojO1nKNG8BLxdpZSkewWrj6rYU= github.com/taikoxyz/optimism v0.0.0-20240627102435-4845247ff00c h1:Hfhh/icxShwpLdX7RqYzZN1EU40MGWhvSXc2V+ZzTxw= github.com/taikoxyz/optimism v0.0.0-20240627102435-4845247ff00c/go.mod h1:jKn73pLX8eDIG0Y3XeuUSetepecM8OvRflyPHbi05B4= github.com/taikoxyz/taiko-geth v1.5.1-0.20240808041410-882a6cd3294c h1:XQDnwQfisAlFAGKqabDcLdg9B+pRwS3nxS+03yP1g9o= diff --git a/packages/taiko-client/integration_test/hive_test.go b/packages/taiko-client/integration_test/hive_test.go index 8676a6977c7..5ade62d145c 100644 --- a/packages/taiko-client/integration_test/hive_test.go +++ b/packages/taiko-client/integration_test/hive_test.go @@ -15,10 +15,11 @@ func TestHiveHandler(t *testing.T) { t.SkipNow() } handler, err := hivesim.NewHiveFramework(&hivesim.HiveConfig{ - DockerOutput: true, - BaseDir: baseDir, - SimPattern: "taiko", - SimTestPattern: "taiko-deneb-testnet/test-deneb-genesis", + BuildOutput: false, + ContainerOutput: true, + BaseDir: baseDir, + SimPattern: "taiko", + SimTestPattern: "taiko-deneb-testnet/test-deneb-genesis", Clients: []string{ "taiko/geth", "taiko/prysm-bn", From 0bfc91382c86b902898456b4af580cc8185af8d9 Mon Sep 17 00:00:00 2001 From: maskpp Date: Tue, 20 Aug 2024 17:08:40 +0800 Subject: [PATCH 2/2] revert to main branch --- .github/workflows/taiko-client--hive_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/taiko-client--hive_test.yml b/.github/workflows/taiko-client--hive_test.yml index ba20e9289a9..5afcbb9acdb 100644 --- a/.github/workflows/taiko-client--hive_test.yml +++ b/.github/workflows/taiko-client--hive_test.yml @@ -2,7 +2,7 @@ name: "Taiko Client Hive Tests" on: push: - branches: [hive_test_logs_] + branches: [main] paths: - "packages/taiko-client/**" - "go.mod"