From ca818ec228e36f355b63e9fa855c171fb3647c81 Mon Sep 17 00:00:00 2001 From: Aleksandr Bezobchuk Date: Tue, 9 May 2023 22:16:28 -0400 Subject: [PATCH] chore(CI): Update Job to Enable Merge Queue (#126) --- .github/workflows/lint.yml | 2 ++ .github/workflows/test.yml | 1 + x/builder/ante/ante_test.go | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 398c785..62d5acc 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -5,10 +5,12 @@ on: - main - release/** pull_request: + merge_group: permissions: contents: read # Optional: allow read access to pull request. Use with `only-new-issues` option. # pull-requests: read + jobs: golangci: name: golangci-lint diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 19ed0b3..22753d2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,6 +1,7 @@ name: Tests / Code Coverage on: pull_request: + merge_group: push: branches: - main diff --git a/x/builder/ante/ante_test.go b/x/builder/ante/ante_test.go index d62d2a2..b292296 100644 --- a/x/builder/ante/ante_test.go +++ b/x/builder/ante/ante_test.go @@ -73,7 +73,7 @@ func (suite *AnteTestSuite) executeAnteHandler(tx sdk.Tx, balance sdk.Coins) (sd signer := tx.GetMsgs()[0].GetSigners()[0] suite.bankKeeper.EXPECT().GetAllBalances(suite.ctx, signer).AnyTimes().Return(balance) - next := func(ctx sdk.Context, tx sdk.Tx, simulate bool) (sdk.Context, error) { + next := func(ctx sdk.Context, _ sdk.Tx, _ bool) (sdk.Context, error) { return ctx, nil }