diff --git a/.github/workflows/arbitrator-ci.yml b/.github/workflows/arbitrator-ci.yml index ae25171859..f2b141fb46 100644 --- a/.github/workflows/arbitrator-ci.yml +++ b/.github/workflows/arbitrator-ci.yml @@ -3,6 +3,7 @@ run-name: Arbitrator CI triggered from @${{ github.actor }} of ${{ github.head_r on: workflow_dispatch: + merge_group: pull_request: paths: - 'arbitrator/**' diff --git a/.github/workflows/arbitrator-skip-ci.yml b/.github/workflows/arbitrator-skip-ci.yml index 6dfd962ee6..75fb47d0a5 100644 --- a/.github/workflows/arbitrator-skip-ci.yml +++ b/.github/workflows/arbitrator-skip-ci.yml @@ -2,6 +2,7 @@ name: Arbitrator skip CI run-name: Arbitrator skip CI triggered from @${{ github.actor }} of ${{ github.head_ref }} on: + merge_group: pull_request: paths-ignore: - 'arbitrator/**' diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a0f5251f9f..0734aecfd0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,6 +3,7 @@ run-name: Go tests CI triggered from @${{ github.actor }} of ${{ github.head_ref on: workflow_dispatch: + merge_group: pull_request: push: branches: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index e4aacdcd65..cfb5b6eda6 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -14,6 +14,8 @@ name: "CodeQL" on: push: branches: [ "master" ] + merge_group: + branches: [ "master" ] pull_request: # The branches below must be a subset of the branches above branches: [ "master" ] diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index d391dd4096..6192f65a4e 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -3,6 +3,7 @@ run-name: Docker build CI triggered from @${{ github.actor }} of ${{ github.head on: workflow_dispatch: + merge_group: pull_request: push: branches: diff --git a/README.md b/README.md index 2cfef3de6a..67a182ec30 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@

- Logo + Logo

Arbitrum Nitro

@@ -14,7 +14,7 @@ ## About Arbitrum Nitro -Logo +Logo Nitro is the latest iteration of the Arbitrum technology. It is a fully integrated, complete layer 2 optimistic rollup system, including fraud proofs, the sequencer, the token bridges, diff --git a/arbnode/batch_poster.go b/arbnode/batch_poster.go index 4f50831e67..57147eb94a 100644 --- a/arbnode/batch_poster.go +++ b/arbnode/batch_poster.go @@ -331,7 +331,7 @@ func (b *BatchPoster) pollForReverts(ctx context.Context) { reverted, err := b.checkReverts(ctx, blockNum) if err != nil { - logLevel := log.Error + logLevel := log.Warn if strings.Contains(err.Error(), "not found") { // Just parent chain node inconsistency // One node sent us a block, but another didn't have it