Age | Commit message (Collapse) | Author |
|
M1 is now available in GitHub CI, but we don't currently have a plan to
use it, so remove the comment.
|
|
The underlying issue has been fixed in the image version 20231029.
|
|
|
|
of head is merge commit
88c8e3a0e4d6bee015a348536c6e12a2c7835896 github actions: Fix test-one-commit when parent of head is merge commit (Ryan Ofsky)
Pull request description:
Instead of figuring out the commit *after* the last merge and rebasing on that with a ~1 suffix, just figure out the last merge commit directly and rebase on it. This way, if HEAD happens to be a merge commit, the rebase just succeeds immediately without blank variables or errors.
Explanation of the problem from https://github.com/bitcoin/bitcoin/pull/28497#issuecomment-1743430631:
> The problem is that the PR only contains a one commit after the last merge, so the job _should_ be skipped, but the `pull_request.commits != 1` check is not smart enough to skip it because the PR is based on another PR and has merge ancestor commits. So specifically what happens is that after HEAD~ is checked out, the new HEAD is a merge commit, so the range `$(git log --merges -1 --format=%H)..HEAD` is equivalent to HEAD..HEAD, which is empty, so the `COMMIT_AFTER_LAST_MERGE` variable is empty and the rebase command fails.
Note: In the current version of this PR, the "test each commit" job is skipped, because this PR only contains a single commit. But I manually verified the code works in earlier versions of the PR that included dummy commits.
ACKs for top commit:
maflcko:
lgtmrecr ACK 88c8e3a0e4d6bee015a348536c6e12a2c7835896
RandyMcMillan:
utACK 88c8e3a
Tree-SHA512: a6865b5c8b96eb0b622b3255971a3cf050dd0f5a356cdfcf7f0cbb659e4a363612e8e62b3ae4fd6b5d9a40bc29176891bc4690659b026c5ef8feea25c8e263cc
|
|
Instead of figuring out the commit *after* the last merge and rebasing on that
with a ~1 suffix, just figure out the last merge commit directly and rebase on
it. This way, if HEAD happens to be a merge commit, the rebase just succeeds
immediately without blank variables or errors.
From https://github.com/bitcoin/bitcoin/pull/28497#issuecomment-1743430631:
The problem is that the PR only contains a one commit after the last merge,
so the job _should_ be skipped, but the `pull_request.commits != 1` check
is not smart enough to skip it because the PR is based on another PR and
has merge ancestor commits. So specifically what happens is that after
HEAD~ is checked out, the new HEAD is a merge commit, so the range `$(git
log --merges -1 --format=%H)..HEAD` is equivalent to HEAD..HEAD, which is
empty, so the `COMMIT_AFTER_LAST_MERGE` variable is empty and the rebase
command fails.
|
|
6988a2f097e9af50e1b4222550b2593bfc5685ea build: Update qt package up to 5.15.10 (Hennadii Stepanov)
Pull request description:
The Qt 5.15.10 contains at least three important for us fixes:
- https://github.com/qt/qtbase/commit/8bb90ab760310c9bc82b6ecbe068532fcb4e7822, which allows us to drop the [`dont_hardcode_x86_64.patch`](https://github.com/bitcoin/bitcoin/blob/fd8ab08558ccfb62f2d0a64d2d0d4dcefba977bc/depends/patches/qt/dont_hardcode_x86_64.patch)
- https://github.com/qt/qtbase/commit/8467beddb7239cc213ae13900fa30e3d26df5e78, which allows us to drop the [`fix_montery_include.patch`](https://github.com/bitcoin/bitcoin/blob/fd8ab08558ccfb62f2d0a64d2d0d4dcefba977bc/depends/patches/qt/fix_montery_include.patch)
- https://github.com/qt/qtbase/commit/df08a21fa4e7139d46ec68bcf264c922789c4f3a, which addresses https://github.com/bitcoin/bitcoin/pull/28349#issuecomment-1743519614
ACKs for top commit:
fanquake:
ACK 6988a2f097e9af50e1b4222550b2593bfc5685ea.
Tree-SHA512: 838c44cf0d7508714f35887bb1f0983e59d96764f08f467bbd03d102d7152e797daeedc178afb03141115cc3be623e4ef7c4c4c65c0a8d1f0bb9702c9a6f8fc6
|
|
|
|
|
|
Some versions of macOS images lack the 'pkg-config' package, which is
required for the build process.
|
|
The new job checks at most 6 commits of a pull request, excluding the
top one.
|
|
This reverts commit 744e0e36703e26d06bc5cd1ef36a1c8568e71d05, reversing
changes made to 8209e86eeb4ceb6dd0e06c45fb3c799bb42834ab.
|
|
fa5356cd49facf195447f0f5921dce1fa53cb25d ci: Limit test-each-commit to --max-count=6 (MarcoFalke)
fafcd2e9ef1209d614de5763a2733098537919dd ci: Add test-each-commit task (MarcoFalke)
Pull request description:
Currently, if a pull request has more than one commit, previous commits may fail to compile, or may fail the tests. This is problematic, because it breaks git-bisect, or worse.
Fix this by adding a CI task for this.
ACKs for top commit:
jonatack:
ACK fa5356cd49facf195447f0f5921dce1fa53cb25d
dergoegge:
utACK fa5356cd49facf195447f0f5921dce1fa53cb25d
hebasto:
ACK fa5356cd49facf195447f0f5921dce1fa53cb25d
Tree-SHA512: 304eff5545501ee499b881f0b0a0c1fe32a7c9f00d96b45bba731af08ac5ca917cef223f5c3d346e30c11a3e6e12e1da297929d3caea9644f3ec1de25dd97c37
|
|
|
|
|
|
See: https://github.com/actions/checkout/releases/tag/v4.0.0
|
|
This occurred when a job was being rerun.
|
|
|
|
good_first_issue template
fa3b8162406bb21425a6fb5c6a96d17175545a4c doc: Fill in the required skills in the good_first_issue template (MarcoFalke)
Pull request description:
Compiling and running the tests is always required, so fill it in to avoid having to type it manually every time.
ACKs for top commit:
willcl-ark:
ACK fa3b816
Tree-SHA512: 1bcb93aaff235dd62513cda05547db90d12ad7638c050ee125845d20df1e1bc457bf4ec590677a0875fae8729dcc58842398e637e517997b35e3b3adffc34a72
|
|
|
|
This change is intended to speed up the CI feedback for pull requests.
|
|
|
|
e7d67efd13f83ba9a6f6e62cb6d12ce37716a404 ci: Use concurrency for pull requests only (Hennadii Stepanov)
Pull request description:
This PR is an amendment for https://github.com/bitcoin/bitcoin/pull/28282.
It avoids skipping builds when some pushes were done consequentially:
![image](https://github.com/bitcoin/bitcoin/assets/32963518/977e9ead-1856-4020-82eb-d16dbead5753)
From GitHub Actions [docs](https://docs.github.com/en/actions/using-jobs/using-concurrency):
> When a concurrent ... workflow is queued, if another ... workflow using the same concurrency group in the repository is in progress, the queued ... workflow will be pending. **Any previously pending ... workflow in the concurrency group will be canceled.**
No behavior change for pull requests:
![image](https://github.com/bitcoin/bitcoin/assets/32963518/4865ae04-fc42-4028-b91e-500c0b36bce6)
ACKs for top commit:
MarcoFalke:
review only ACK e7d67efd13f83ba9a6f6e62cb6d12ce37716a404
dergoegge:
lgtm ACK e7d67efd13f83ba9a6f6e62cb6d12ce37716a404
Tree-SHA512: 360be9dbb46354d988935643e8793ea630c3416609c45aab4c39075a00a427487446a34a4fb93b490ece43cabe43640fcc6fb2ac97760e2c6ee54b95241da826
|
|
fa8e89d5e48c4554eddef611eb002b61f3305272 ci: Remove distro-name from task name (MarcoFalke)
fad006fa0a8de7b527e9f7b50306921df7a2069a ci: Switch remaining tasks to self-hosted (MarcoFalke)
Pull request description:
Cirrus CI will be capping the free compute soon. For now, switch more tasks to persistent worker, as recommended by Cirrus CI.
(See slightly related discussion in https://github.com/bitcoin/bitcoin/issues/28098)
ACKs for top commit:
pinheadmz:
concept ACK fa8e89d5e48c4554eddef611eb002b61f3305272
dergoegge:
ACK fa8e89d5e48c4554eddef611eb002b61f3305272
hebasto:
ACK fa8e89d5e48c4554eddef611eb002b61f3305272.
Tree-SHA512: f6b172fee14856021b7a219b2490c8a163ad0137567c34a383080c68f8319b1d846923e508a968f43fb63ed6ce536dcb0611905fa288271f2267764b07bf9ecb
|
|
Otherwise, any previously pending workflow will be canceled on the
following push.
|
|
Otherwise, multiple pull requests fill GitHub Actions cache quota
shortly.
|
|
The exact distro name should not be important. Also, it is easy to find
out, if needed. Thus, remove it to avoid bloat and maintenance overhead
having to keep it in sync.
|
|
fa263877691a7babb08a83f5f977390a0ba64729 ci: Refactor: Remove CI_USE_APT_INSTALL (MarcoFalke)
Pull request description:
Seems odd to use `CI_USE_APT_INSTALL == no` as an alias for `CI_OS_NAME == macos`. Fix this by removing the alias.
Also, for github CI:
* restore MAKEJOBS to the same value as in cirrus.yml.
* remove cirrus-only PACKAGE_MANAGER_INSTALL.
* remove redundant TEST_RUNNER_TIMEOUT_FACTOR
* Add M1 link
ACKs for top commit:
hebasto:
ACK fa263877691a7babb08a83f5f977390a0ba64729.
Tree-SHA512: e235aa70abd60738a9ad1531284a94e2122c9c7a22c2514ede437b49da5c06b2597fba7fccf615541fb3adb4e1f8076aa8c6047f926393191a629713554ab000
|
|
|
|
|
|
This avoids "mkdir: /ci_container_base: Read-only file system"
|
|
Also, the "macOS native arm64" task has been removed from Cirrus CI.
|
|
These provide more flexibility and can be designed to extract more
information from users when submitting issues.
|
|
Now it's just the standard library.
|
|
|
|
|
|
CONTRIBUTING.md
|
|
|
|
|
|
On 2019-12-09 Visual Studio has been upgraded to 16.4.0 in Windows
Server 2019 (windows-latest) virtual environment.
|
|
|
|
|
|
|
|
|
|
|
|
I've noticed the "Bug" label being added redundantly fairly frequently.
I think this might be due to github's templates.
All in all, the link in https://github.com/bitcoin/bitcoin/issues/new/choose
to open a regular issue is a bit hidden from sight. Direct people's
attention to it.
|
|
This prevents the common annoyance of the text being included into PRs
accidentally.
|
|
|
|
|
|
|
|
|