Skip to content

Conversation

@sipa
Copy link
Member

@sipa sipa commented Oct 3, 2020

No description provided.

@sipa
Copy link
Member Author

sipa commented Oct 3, 2020

It looks like #20071 is working. From this PR's log https://travis-ci.org/github/bitcoin/bitcoin/jobs/732604246:

Checking commit 4d2286364f62762dd2c0471752baab377ab82e3e ...
commit 4d2286364f62762dd2c0471752baab377ab82e3e
tree a8f0e04f8c8abd7f0713e136fa58d2e7b5ad93ee
parent 171cd05ae3413e18fd6382572c86f2bb21ab2fd9
author Fabian Jahr <[email protected]> 1601740843 +0200
committer Pieter Wuille <[email protected]> 1601761112 -0700
    lint: Don't use TRAVIS_COMMIT_RANGE for commit-script-check
:100755 100755 003bdf3c2 dc0f9b923 M	ci/lint/06_script.sh

Checking commit 2ac32d581428a5fcb831caab964612ddf04568a9 ...
commit 2ac32d581428a5fcb831caab964612ddf04568a9
tree 05734a8d5fbe02f3a113597a96e3f8cdc47d5b7d
parent 4d2286364f62762dd2c0471752baab377ab82e3e
author Fabian Jahr <[email protected]> 1601749423 +0200
committer Pieter Wuille <[email protected]> 1601761112 -0700
    lint: Don't use TRAVIS_COMMIT_RANGE in whitespace linter
:100755 100755 d8bdb0a8d 80af0a439 M	test/lint/lint-whitespace.sh

Checking commit ca1f6fc7c73851c2013e56b1663f236f70dca8a3 ...
commit ca1f6fc7c73851c2013e56b1663f236f70dca8a3
tree 92627925a710e2d0fd44533a58bd35a884052fa8
parent 2ac32d581428a5fcb831caab964612ddf04568a9
author Fabian Jahr <[email protected]> 1601754217 +0200
committer Pieter Wuille <[email protected]> 1601761112 -0700
    lint: Use TRAVIS_BRANCH in lint-git-commit-check.sh
:100755 100755 8947f67bf ecaad215c M	test/lint/lint-git-commit-check.sh

Checking commit 26cb6e6d8db2034f281ca829dcd9b8422d8aad5e ...
commit 26cb6e6d8db2034f281ca829dcd9b8422d8aad5e
tree bc9133081271c957c79a151d95fd7738f4fcc2ef
parent ca1f6fc7c73851c2013e56b1663f236f70dca8a3
author Pieter Wuille <[email protected]> 1601761242 -0700
committer Pieter Wuille <[email protected]> 1601761242 -0700
    [donotmerge] Print checked commits
:100755 100755 ff3f78443 b5b74dc83 M	test/lint/commit-script-check.sh

Checking commit cef3cda64b8d42050d338824fe44165f53f2e41d ...
commit cef3cda64b8d42050d338824fe44165f53f2e41d
tree 93c2cf8351e1fb00ef281b50a2160c6f832af28e
parent 26cb6e6d8db2034f281ca829dcd9b8422d8aad5e
author Pieter Wuille <[email protected]> 1601761849 -0700
committer Pieter Wuille <[email protected]> 1601761849 -0700
    log more
:100755 100755 b5b74dc83 6a1993a0e M	test/lint/commit-script-check.sh

Checking commit d2f7f06bfdd41906783d5476acae42c1f839416f ...
commit d2f7f06bfdd41906783d5476acae42c1f839416f
tree 09798c159065498ff6747d260d2935c86bb5085f
parent 54fc96ffa70ad3a53d32709101b7a2ce064d822e
parent cef3cda64b8d42050d338824fe44165f53f2e41d
author Pieter Wuille <[email protected]> 1601761869 +0200
committer GitHub <[email protected]> 1601761869 +0200
gpgsig -----BEGIN PGP SIGNATURE-----
 
 wsBcBAABCAAQBQJfePJNCRBK7hj4Ov3rIwAAdHIIAF/RaSvfDiohO5sNSkPHZTF6
 r7qXVnLBPhlJ/wdSL+a0VzfufRqoj282MnjVEc+JZpQ6pujGW5I2jO6d/ztQ9RBa
 VhUlbLVtU/GAlA1oS38TIcu0x9kUhLwn6oYdbrn0230DkAhdHS/Ad/5NmmoolPYz
 j9XtoQSwf7EC1h1jD3aL+ROtKpkl4YwoGUWrdRnvDAeO/IVnRQ03R+bxhuC7LxJC
 txMoCPB3cvMr6i7Y5lTJu7sklP3fWToQkZAp+hPEpOMKQgjidukfHwl6/1x0XdC2
 G9rrm7/nGhkolUoTo3bojwIRuTgsNXFyI7Js4eYadGZWtaVGFp4ycts5yDXWgn0=
 =GsDy
 -----END PGP SIGNATURE-----

    Merge cef3cda64b8d42050d338824fe44165f53f2e41d into 54fc96ffa70ad3a53d32709101b7a2ce064d822e

Which is exactly the 5 commits in this PR + a github-generated merge commit (with GPG sig!), but not the missing master commit.

@sipa sipa closed this Oct 3, 2020
maflcko pushed a commit to maflcko/bitcoin-core that referenced this pull request Oct 4, 2020
a91ab86 lint: Use TRAVIS_BRANCH in lint-git-commit-check.sh (Fabian Jahr)
c11dc99 lint: Don't use TRAVIS_COMMIT_RANGE in whitespace linter (Fabian Jahr)
1b41ce8 lint: Don't use TRAVIS_COMMIT_RANGE for commit-script-check (Fabian Jahr)

Pull request description:

  This is causing problems again, very similar to bitcoin#19654.

  UPDATE: This now removes all remaining usages of TRAVIS_COMMIT_RANGE and instead uses TRAVIS_BRANCH for the range, including `lint-git-commit-check` where TRAVIS_COMMIT_RANGE had already been removed. For builds triggered by a pull request, TRAVIS_BRANCH is the name of the branch targeted by the pull request. In the linters there is still a fallback that assumes master as the target branch.

ACKs for top commit:
  sipa:
    ACK a91ab86. See test I tried in bitcoin#20075.

Tree-SHA512: 1378bdebd5d8787a83fbda5d9999cc9447209423e7f0218fe5eb240e6a32dc1b51d1cd53b4f8cd1f71574d935ac5e22e203dfe09cce17e9976a48416038e1263
@bitcoin bitcoin locked and limited conversation to collaborators Oct 11, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants