Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into feat/optimistic-exec-v2
Browse files Browse the repository at this point in the history
  • Loading branch information
Randy Grok committed Nov 26, 2024
2 parents 857f14c + 14d98d2 commit f78dbe0
Show file tree
Hide file tree
Showing 229 changed files with 11,745 additions and 4,525 deletions.
10 changes: 8 additions & 2 deletions .github/workflows/dependabot-update-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: Dependabot Update All Go Modules
on: pull_request

permissions:
contents: write
pull-requests: write

env:
Expand All @@ -12,12 +13,17 @@ jobs:
runs-on: ubuntu-latest
if: ${{ github.actor == 'dependabot[bot]' }}
steps:
- name: Generate Token
uses: actions/create-github-app-token@5d869da34e18e7287c1daad50e0b8ea0f506ce69 # v1
id: app-token
with:
app-id: "${{ secrets.APP_ID }}"
private-key: "${{ secrets.APP_PRIVATE_KEY }}"
- uses: actions/checkout@v4
with:
repository: ${{ github.event.pull_request.head.repo.full_name }}
ref: ${{ github.event.pull_request.head.ref }}
# Secret to be added in the repo under Settings > Secrets > Dependabot
token: ${{ secrets.PRBOT_PAT }}
token: "${{ steps.app-token.outputs.token }}"
- uses: actions/setup-go@v5
with:
go-version: "1.23"
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/misspell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ on:
schedule:
- cron: "0 12 * * *"

permissions:
contents: write
pull-requests: write

jobs:
build:
runs-on: ubuntu-latest
Expand All @@ -19,7 +23,6 @@ jobs:
- uses: peter-evans/create-pull-request@v7
if: github.event_name != 'pull_request'
with:
token: ${{ secrets.PRBOT_PAT }}
commit-message: "chore: spelling errors fixes"
title: "chore: fix spelling errors"
branch: "bot/fix-typos"
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ on:
- main

permissions:
contents: read
contents: write
pull-requests: write

concurrency:
group: ci-${{ github.ref }}-tests
Expand Down
26 changes: 13 additions & 13 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,17 @@
queue_rules:
- name: default
conditions:
- "#approved-reviews-by>1"

pull_request_rules:
- name: automerge to main with label automerge and branch protection passing
conditions:
queue_conditions:
- "#approved-reviews-by>1"
- base=main
- label=A:automerge
actions:
queue:
name: default
method: squash
commit_message_template: |
{{ title }} (#{{ number }})
{{ body }}
merge_conditions:
- "#approved-reviews-by>1"
commit_message_template: |
{{ title }} (#{{ number }})
{{ body }}
merge_method: squash

pull_request_rules:
- name: backport patches to v0.52.x branch
conditions:
- base=main
Expand Down Expand Up @@ -56,3 +52,7 @@ pull_request_rules:
backport:
branches:
- release/v0.45.x
- name: automerge to main with label automerge and branch protection passing
conditions: []
actions:
queue:
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ Every module contains its own CHANGELOG.md. Please refer to the module you are i

### Improvements

* (testutil/integration) [#22616](https://github.com/cosmos/cosmos-sdk/pull/22616) Remove double context in integration tests v1.
* Use integrationApp.Context() instead of creating a context prior.

### Bug Fixes

* (sims) [#21906](https://github.com/cosmos/cosmos-sdk/pull/21906) Skip sims test when running dry on validators
Expand Down
5 changes: 3 additions & 2 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Our Pledge

In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.

## Our Standards

Expand Down Expand Up @@ -30,7 +30,7 @@ Project maintainers have the right and responsibility to remove, edit, or reject

## Scope

This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
This Code of Conduct applies within all project spaces, and it also applies when an individual is representing the project or its community in public spaces. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.

## Enforcement

Expand All @@ -41,6 +41,7 @@ Project maintainers who do not follow or enforce the Code of Conduct in good fai
## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [https://contributor-covenant.org/version/1/4/code-of-conduct][version]
For answers to common questions about this code of conduct, see https://contributor-covenant.org/faq

[homepage]: https://contributor-covenant.org
[version]: https://contributor-covenant.org/version/1/4/code-of-conduct/
Loading

0 comments on commit f78dbe0

Please sign in to comment.