Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ci: fix mergify config and prevent spurious test failures #145

Merged
merged 2 commits into from
Jun 10, 2022
Merged

ci: fix mergify config and prevent spurious test failures #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2a1796
mergify: replace strict merge with queue+rebase
grondo Jun 4, 2022
88b638d
t0001-basic.sh: do not fail on stderr in test-lib tests
grondo Jun 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions .mergify.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pull_request_rules:
- name: rebase and merge when passing all checks
queue_rules:
- name: default
conditions:
- base=master
- status-success="validate commits"
Expand All @@ -12,11 +12,22 @@ pull_request_rules:
- "#approved-reviews-by>0"
- "#changes-requested-reviews-by=0"
- -title~=^\[*[Ww][Ii][Pp]

pull_request_rules:
- name: rebase and merge when passing all checks
conditions:
- base=master
- label="merge-when-passing"
- label!="work-in-progress"
- "approved-reviews-by=@chaos/chaos-developers"
- "#approved-reviews-by>0"
- "#changes-requested-reviews-by=0"
- -title~=^\[*[Ww][Ii][Pp]
actions:
merge:
queue:
name: default
method: merge
strict: smart
strict_method: rebase
update_method: rebase
- name: remove outdated approved reviews
conditions:
- author!=@chaos-developers
Expand Down
2 changes: 0 additions & 2 deletions tests/t0001-basic.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ EOF

chmod +x passing-todo.sh &&
./passing-todo.sh >out 2>err &&
! test -s err &&
sed -e 's/^> //' >expect <<EOF &&
> ok 1 - pretend we have fixed a known breakage # TODO known breakage
> # fixed 1 known breakage(s)
Expand Down Expand Up @@ -95,7 +94,6 @@ test_done
EOF
chmod +x failing-cleanup.sh &&
test_must_fail ./failing-cleanup.sh >out 2>err &&
! test -s err &&
! test -f \"trash directory.failing-cleanup/clean-after-failure\" &&
sed -e 's/Z$//' -e 's/^> //' >expect <<\EOF &&
> not ok - 1 tests clean up even after a failure
Expand Down