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

merge-queue: embarking main (d86896b) and [#3758 + #3773] together #3780

Closed
wants to merge 7 commits into from
Closed

merge-queue: embarking main (d86896b) and [#3758 + #3773] together #3780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cff40aa
fix(test/lightwalletd): add an alternative matching log line
teor2345 Mar 7, 2022
203bfdc
Merge branch 'main' into fix-ligtwalletd-test-log
mergify[bot] Mar 7, 2022
e351739
fix(ci): only run the full sync test on mergify queue PRs
teor2345 Mar 7, 2022
7e12049
fix inconsistent indenting and syntax
teor2345 Mar 7, 2022
4253bd7
Update .github/workflows/test-full-sync.yml
gustavovalverde Mar 8, 2022
8637ce8
Merge of #3758
mergify[bot] Mar 8, 2022
1f0ac09
Merge of #3773
mergify[bot] Mar 8, 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
8 changes: 5 additions & 3 deletions .github/workflows/test-full-sync.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
inputs:
network:
default: 'Mainnet'
pull_request_review:
pull_request:
branches:
- main
paths:
Expand All @@ -21,7 +21,6 @@ on:
# workflow definitions
- 'docker/**'
- '.github/workflows/test-full-sync.yml'
types: [submitted]

env:
CARGO_INCREMENTAL: '1'
Expand All @@ -37,6 +36,9 @@ env:

jobs:
build:
# only run on Mergify head branches:
# https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#running-your-workflow-based-on-the-head-or-base-branch-of-a-pull-request-1
if: startsWith(github.head_ref, 'mergify/merge-queue/')
name: Build images
timeout-minutes: 210
runs-on: ubuntu-latest
Expand All @@ -48,7 +50,7 @@ jobs:
- name: Inject slug/short variables
uses: rlespinasse/github-slug-action@v4

# Automatic tag management and OCI Image Format Specification for labels
# Automatic tag management and OCI Image Format Specification for labels
- name: Docker meta
id: meta
uses: docker/metadata-action@v3.6.2
Expand Down
7 changes: 4 additions & 3 deletions zebrad/tests/acceptance.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1694,10 +1694,11 @@ fn lightwalletd_integration() -> Result<()> {
lightwalletd.expect_stdout_line_matches("Method not found.*error zcashd getblock rpc");
let (_, zebrad) = zebrad.kill_on_error(result)?;

// zcash/lightwalletd exits with a fatal error here, but
// adityapk00/lightwalletd keeps trying the mempool
// zcash/lightwalletd exits with a fatal error here.
// adityapk00/lightwalletd keeps trying the mempool,
// but it sometimes skips the "Method not found" log line.
let result =
lightwalletd.expect_stdout_line_matches("Mempool refresh error: -32601: Method not found");
lightwalletd.expect_stdout_line_matches("(Mempool refresh error: -32601: Method not found)|(Another refresh in progress, returning)");
let (_, zebrad) = zebrad.kill_on_error(result)?;

// Cleanup both processes
Expand Down