Skip to content

Commit

Permalink
Merge branch 'master' into gligneul/stylus-delegate-call-test
Browse files Browse the repository at this point in the history
  • Loading branch information
joshuacolvin0 authored Jul 16, 2024
2 parents a1bb6bf + c9304db commit 0d9839a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ jobs:
if: matrix.test-mode == 'defaults'
run: |
packages=`go list ./...`
stdbuf -oL gotestsum --format short-verbose --packages="$packages" --rerun-fails=1 --no-color=false -- ./... -coverprofile=coverage.txt -covermode=atomic -coverpkg=./...,./go-ethereum/... -timeout 20m -parallel=8 > >(stdbuf -oL tee full.log | grep -vE "INFO|seal")
stdbuf -oL gotestsum --format short-verbose --packages="$packages" --rerun-fails=1 --no-color=false -- ./... -coverprofile=coverage.txt -covermode=atomic -coverpkg=./...,./go-ethereum/... -timeout 20m -parallel=8 -tags=cionly > >(stdbuf -oL tee full.log | grep -vE "INFO|seal")
- name: run tests with race detection
if: matrix.test-mode == 'race'
Expand Down
6 changes: 4 additions & 2 deletions system_tests/fees_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@
// For license information, see https://github.com/nitro/blob/master/LICENSE

// these tests seems to consume too much memory with race detection
//go:build !race
// +build !race
// Test randomly fails with L1 gas price estimate should tend toward the basefee
// so skipping locally, but running on CI
//go:build !race && cionly
// +build !race,cionly

package arbtest

Expand Down
2 changes: 1 addition & 1 deletion validator/server_arb/execution_run.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ type executionRun struct {
close sync.Once
}

// NewExecutionChallengeBackend creates a backend with the given arguments.
// NewExecutionRun creates a backend with the given arguments.
// Note: machineCache may be nil, but if present, it must not have a restricted range.
func NewExecutionRun(
ctxIn context.Context,
Expand Down

0 comments on commit 0d9839a

Please sign in to comment.