diff options
| author | fanquake <fanquake@gmail.com> | 2023-08-16 12:57:03 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2023-08-16 13:10:58 +0100 |
| commit | 60d3e4b0cd8716a6fe1be6b4d1b8237da8e56126 (patch) | |
| tree | e86964ebb686fb5738541461fd9e0a7d4b58ec6f /src/util/error.h | |
| parent | 72304ccf1e1583fd419222c9d9f0d44938a75352 (diff) | |
| parent | fa6e5d3eeffebf81b5d7ca99bf7b5e70356516ab (diff) | |
Merge bitcoin/bitcoin#28273: ci: Fix macOS-cross SDK rsync
fa6e5d3eeffebf81b5d7ca99bf7b5e70356516ab ci: Avoid error on macOS native (MarcoFalke)
fa193f5dfc937a7ff8e12b9ffd21861046a46489 ci: Fix macOS-cross SDK rsync (MarcoFalke)
Pull request description:
This should fix the macOS-cross build on Cirrus CI containers.
Locally this was already working, because the SDK was cached in
`/ci_container_base/` in the image, which is also the folder used for a
later CI run.
However, on Cirrus CI, when using an image *and* a custom `BASE_ROOT_DIR`,
the SDK will not be found in `/ci_base_install/`, nor in `BASE_ROOT_DIR`.
Fix this by normalizing *all* folders to `/ci_container_base/`.
ACKs for top commit:
hebasto:
ACK fa6e5d3eeffebf81b5d7ca99bf7b5e70356516ab
Tree-SHA512: 8312f7e72c3638caa6804e39206d3563ba1703204d53ce63de22e0a16a71e1e143ec00fac6b43ebfc0653c7b74160472c04e95e2d694c8c0965e7dc39e627d39
Diffstat (limited to 'src/util/error.h')
0 files changed, 0 insertions, 0 deletions