ci: Add and document BASE_BUILD_DIR #18735

pull MarcoFalke wants to merge 1 commits into bitcoin:master from MarcoFalke:2004-ciBaseBuildDir changing 4 files +10 −10

MarcoFalke commented at 2:11 PM on April 22, 2020: member

Also fixes #18768
practicalswift commented at 2:23 PM on April 22, 2020: contributor

Concept ACK
hebasto commented at 3:44 PM on April 22, 2020: member

Concept ACK.
MarcoFalke force-pushed on Apr 22, 2020
hebasto commented at 5:02 PM on April 25, 2020: member

Wasn't BASE_BUILD_DIR removed in #17549?
MarcoFalke commented at 5:20 PM on April 25, 2020: member

Back then it was an alias for BASE_ROOT_DIR (the root of the git folder) and removed because it was redundant.
MarcoFalke force-pushed on Apr 26, 2020

hebasto commented at 3:50 PM on April 26, 2020: member

Also fixes #18768

Is this message expected:

it looks like wine32 is missing, you should install it.
multiarch needs to be enabled first.  as root, please
execute "dpkg --add-architecture i386 && apt-get update &&
apt-get install wine32"

MarcoFalke commented at 4:25 PM on April 26, 2020: member

no idea. This was removed in 59e9688eda4c4b01ee1713625632cd766c1a7ca9

Seems unrelated to this pull.

in ci/test/00_setup_env.sh:55 in fa6630d11a outdated

  48 | @@ -49,8 +49,10 @@ export CCACHE_DIR=${CCACHE_DIR:-$BASE_SCRATCH_DIR/.ccache}
  49 |  # The depends dir.
  50 |  # This folder exists on the ci host and ci guest. Changes are propagated back and forth.
  51 |  export DEPENDS_DIR=${DEPENDS_DIR:-$BASE_ROOT_DIR/depends}
  52 | -# Folder where the build is done (bin and lib).
  53 | +# Folder where the build result is put (bin and lib).
  54 |  export BASE_OUTDIR=${BASE_OUTDIR:-$BASE_SCRATCH_DIR/out/$HOST}
  55 | +# Folder where the build is done (dist and out-of-tree build).
  56 | +export BASE_BUILD_DIR=${BASE_OUTDIR:-$BASE_SCRATCH_DIR/build}

hebasto commented at 12:16 AM on April 27, 2020:

Did you mean

export BASE_BUILD_DIR=${BASE_BUILD_DIR:-$BASE_SCRATCH_DIR/build}

hebasto commented at 12:45 AM on April 27, 2020: member

It is absolutely unrelated, but would you mind adding a typo fix in https://github.com/bitcoin/bitcoin/blob/fa6630d11a5a30f73e2e76d0804f518b9cba094d/ci/test/00_setup_env.sh#L62 s/:/:-/ ?
hebasto approved
hebasto commented at 1:42 AM on April 27, 2020: member

ACK 1937d1ea445e9d10408941d3eca95bbca0ad6ac5
MarcoFalke force-pushed on Apr 27, 2020
MarcoFalke commented at 3:58 PM on April 27, 2020: member

Done
hebasto approved
hebasto commented at 4:01 PM on April 27, 2020: member

re-ACK fae1a37bc55fc85cd179cdfb35f0b8b92dd69008, only a typo fixed since the previous review.

ci: Add and document BASE_BUILD_DIR

Co-Authored-By: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>

fae49f6e42

MarcoFalke force-pushed on Apr 27, 2020
MarcoFalke commented at 4:28 PM on April 27, 2020: member

The "typo fix" doesn't pass, so I went ahead and reverted it. https://cirrus-ci.com/task/4815052404424704?command=ci#L20

I don't understand bash well enough to debug this, but this might be related: https://wiki.bash-hackers.org/syntax/pe#use_a_default_value
hebasto commented at 4:32 PM on April 27, 2020: member

The "typo fix" doesn't pass, so I went ahead and reverted it. https://cirrus-ci.com/task/4815052404424704?command=ci#L20

I don't understand bash well enough to debug this, but this might be related: https://wiki.bash-hackers.org/syntax/pe#use_a_default_value

I'll look into it. Also https://www.gnu.org/software/bash/manual/html_node/Shell-Parameter-Expansion.html
MarcoFalke closed this on Apr 28, 2020
MarcoFalke reopened this on Apr 28, 2020
hebasto approved
hebasto commented at 3:38 PM on April 28, 2020: member

re-ACK fae49f6e424f31e93c5620d5ff893fb517ef4a8b, which is essentially the same as the previously reviewed changes.
MarcoFalke commented at 3:49 PM on April 28, 2020: member
- https://cirrus-ci.com/build/5921186234236928 passing. Example: https://cirrus-ci.com/task/5984865600405504?command=ci#L2587
- Example travis: https://travis-ci.org/github/bitcoin/bitcoin/jobs/680541926#L3106
MarcoFalke merged this on Apr 28, 2020
MarcoFalke closed this on Apr 28, 2020
MarcoFalke deleted the branch on Apr 28, 2020
MarcoFalke referenced this in commit ab91a0e0fc on Apr 29, 2020
sidhujag referenced this in commit 07691a241c on Apr 29, 2020
DrahtBot locked this on Feb 15, 2022

Contributors

MarcoFalke

practicalswift

hebasto

Linked (view graph)

#18768 ci: RUN_UNIT_TESTS_SEQUENTIAL is broken on Windows #18798 ci: Fix default retry script usage