Skip to content

Commit

Permalink
Fraz/force rebase before queue (#3)
Browse files Browse the repository at this point in the history
closes: #XXXX
refs: #XXXX

## Description


### Security Considerations


### Scaling Considerations


### Documentation Considerations


### Testing Considerations


### Upgrade Considerations
  • Loading branch information
mergify[bot] authored Aug 5, 2024
2 parents 20e704b + c11c783 commit b49bd2b
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 2 deletions.
38 changes: 38 additions & 0 deletions .github/workflows/check-fixup-commits.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: Check for fixup commits

on:
pull_request:
types:
- opened
- reopened
- synchronize
- converted_to_draft
- ready_for_review
- labeled
- unlabeled
- auto_merge_enabled
- auto_merge_disabled

jobs:
check-fixup-commits:
runs-on: ubuntu-latest

env:
HEAD_SHA: ${{ github.event.pull_request.head.sha }}
BASE_SHA: ${{ github.event.pull_request.base.sha }}

steps:
- name: Checkout code
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Check for fixup commits
id: fixup-commits
run: |
if [[ $(git rev-list "$BASE_SHA".."$HEAD_SHA" --grep="^fixup! " | wc -l) -eq 0 ]]; then
echo "No fixup commits found in commit history"
else
echo "Fixup commits found in commit history"
exit 1
fi
9 changes: 9 additions & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ pull_request_rules:
conditions:
- base=master
- label=automerge:rebase
- linear-history
actions:
queue:
merge_method: merge
Expand All @@ -79,3 +80,11 @@ pull_request_rules:
actions:
queue:
merge_method: squash
- name: rebase and autosquash
conditions:
- base=master
- label=automerge:rebase
- -linear-history
actions:
rebase:
autosquash: true
4 changes: 2 additions & 2 deletions multichain-testing/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ The `agoric` software revision includes the vats necessary for building and test

First, ensure you have Kubernetes available. See https://docs.cosmology.zone/starship/get-started/step-2.

The following will install `kubectl`, `kind`, `helm`, and `yq` as needed.
The followinsg will install `kubectl`, `kind`, `helm`, and `yq` as needed.

```sh
make clean setup
Expand All @@ -45,7 +45,7 @@ make port-forward
make fund-provision-pool override-chain-registry
```

If you get an error like "connection refused", you need to wait longer, until all the pods are Running.
If you get an error like "connection refused", you need to wait longer, until all asdasthe pods are Running.

# Cleanup

Expand Down

0 comments on commit b49bd2b

Please sign in to comment.