Skip to content

Fix broken build due to conflict between #1340 and #999#1345

Merged
sanket1729 merged 1 commit intorust-bitcoin:masterfrom
apoelstra:2022-10--fix-ci
Oct 27, 2022
Merged

Fix broken build due to conflict between #1340 and #999#1345
sanket1729 merged 1 commit intorust-bitcoin:masterfrom
apoelstra:2022-10--fix-ci

Conversation

@apoelstra
Copy link
Copy Markdown
Member

I will test merge commits more thoroughly before signing off on them in future, sorry.

…itcoin#999

I will test merge commits more thoroughly before signing off on them in future, sorry.
@apoelstra
Copy link
Copy Markdown
Member Author

Looks like I beat you @tcharding

Copy link
Copy Markdown
Member

@tcharding tcharding left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK c4084b9

@tcharding
Copy link
Copy Markdown
Member

Can we merge this with a single ACK? Then I can rebase all my PRs so they are green by the time @Kixunil wakes up :)

@DanGould
Copy link
Copy Markdown
Contributor

tACK c4084b9

That was quick

@tcharding
Copy link
Copy Markdown
Member

CC @apoelstra just in case you check mentions before signing off for the day.

@apoelstra
Copy link
Copy Markdown
Member Author

Sure, I'll try to merge, but I think GIthub will block it even from the command-line.

In any case, it will take several minutes for me to run my full test script on the merge commit :)

@apoelstra
Copy link
Copy Markdown
Member Author

remote: Resolving deltas: 100% (4/4), completed with 4 local objects.
remote: error: GH006: Protected branch update failed for refs/heads/master.
remote: error: At least 2 approving reviews are required by reviewers with write access.
To github.com:rust-bitcoin/rust-bitcoin
 ! [remote rejected]     master -> master (protected branch hook declined)
error: failed to push some refs to 'github.com:rust-bitcoin/rust-bitcoin'
Traceback (most recent call last):

Sorry. (And this is enforced on admins specifically because I fat-fingered a push a few months ago, so I don't want to turn it off for something that can be dealt with by waiting for the morning :))

@tcharding
Copy link
Copy Markdown
Member

No sweat, thanks man.

@RCasatta
Copy link
Copy Markdown
Collaborator

@apoelstra please share/push your test script so that I can update my testcmd

@apoelstra
Copy link
Copy Markdown
Member Author

@Kixunil could you pls ack this?

@apoelstra
Copy link
Copy Markdown
Member Author

@RCasatta https://github.com/apoelstra/git-scripts wrapped in

#!/bin/sh

set -e

CHECKSCRIPT=~/code/script/git/master/check.py

PRNUM=$1
ACK=$2
if [ x$PRNUM == x ]; then
    echo "usage: $0 prnum"
    exit 1
fi

CHECKS='[
    {
        "type": "rust",
        "working-dir": "bitcoin",
        "features": ["rand", "serde", "base64", "std", "no-std", "secp-lowmemory", "secp-recovery"],
        "version": ["stable", "nightly"],
        "jobs": [ "build", "test" ],
        "force-default-features": true
    },
    {
        "type": "rust",
        "working-dir": "internals",
        "version": ["stable", "nightly"],
        "jobs": [ "build", "test" ],
        "force-default-features": true
    },
    {
        "type": "rust",
        "working-dir": "bitcoin",
        "only-tip": true,
        "version": "1.41.0",
        "jobs": [ "build", "test" ],
        "features": ["rand", "serde", "base64", "std", "secp-lowmemory", "secp-recovery"],
        "force-default-features": true
    },
    {
        "working-dir": "fuzz",
        "type": "rust",
        "version": [ "stable", "nightly" ],
        "jobs": [ "test" ],
        "force-default-features": true
    },
    {
        "type": "rust",
        "working-dir": "internals",
        "only-tip": true,
        "version": "1.41.0",
        "jobs": [ "build", "test" ],
        "force-default-features": true
    },
    {
        "type": "rust",
        "only-tip": true,
        "version": "1.56.0",
        "fuzz_dir": "fuzz/fuzz_targets",
        "fuzz_iters": 1000000,
        "jobs": [ "fuzz" ]
    }
]'

if [ x$2 == "xone" ]; then
    ${CHECKSCRIPT} $PRNUM "$CHECKS" --one
else
    ${CHECKSCRIPT} $PRNUM "$CHECKS"
fi

if [ x$ACK != x ]; then
    gh pr review $ACK -a -b "ACK $(git rev-parse pr/$ACK/head)"
fi

@tcharding
Copy link
Copy Markdown
Member

Can we get second ack on this one please (cc @Kixunil, @sanket1729)

Copy link
Copy Markdown
Member

@sanket1729 sanket1729 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK c4084b9

@sanket1729 sanket1729 merged commit bd80ecd into rust-bitcoin:master Oct 27, 2022
@apoelstra apoelstra deleted the 2022-10--fix-ci branch October 27, 2022 13:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants