From 0d2ca88624ae58500a27ae0b930559f4114f8661 Mon Sep 17 00:00:00 2001 From: PastaPastaPasta <6443210+PastaPastaPasta@users.noreply.github.com> Date: Thu, 15 Jul 2021 19:50:54 -0500 Subject: [PATCH 1/3] Add auto rebaseing stuff (#6) --- .github/workflows/rebase.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .github/workflows/rebase.yml diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml new file mode 100644 index 0000000000000..d2a868fd3ebd1 --- /dev/null +++ b/.github/workflows/rebase.yml @@ -0,0 +1,19 @@ +name: Automatic Rebase +on: + issue_comment: + types: [created] +jobs: + rebase: + name: Rebase + if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase') + runs-on: ubuntu-latest + steps: + - name: Checkout the latest code + uses: actions/checkout@v2 + with: + token: ${{ secrets.GITHUB_TOKEN }} + fetch-depth: 0 # otherwise, you will fail to push refs to dest repo + - name: Automatic Rebase + uses: cirrus-actions/rebase@1.4 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 9b90eb4fe27758ce99f2e53729fff01e4ff93b15 Mon Sep 17 00:00:00 2001 From: pasta Date: Thu, 15 Jul 2021 20:29:19 -0500 Subject: [PATCH 2/3] test1 Signed-off-by: pasta --- src/wallet/wallet.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 05095c4b9c808..a7a26d50c511b 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -49,7 +49,7 @@ #include -static const size_t OUTPUT_GROUP_MAX_ENTRIES = 10; +static const size_t OUTPUT_GROUP_MAX_ENTRIES = 10; // Test one static CCriticalSection cs_wallets; static std::vector> vpwallets GUARDED_BY(cs_wallets); From 57a672c87fb11dbb0a7173fb582c0059a70df87d Mon Sep 17 00:00:00 2001 From: pasta Date: Thu, 15 Jul 2021 20:30:51 -0500 Subject: [PATCH 3/3] test2 Signed-off-by: pasta --- src/wallet/wallet.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index a7a26d50c511b..201a4424ae863 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2010 Satoshi Nakamoto +// Copyright (c) 2009-2010 Satoshi // Copyright (c) 2009-2015 The Bitcoin Core developers // Copyright (c) 2014-2021 The Dash Core developers // Distributed under the MIT software license, see the accompanying