Page MenuHomePhabricator

unbreak windows build

Authored by PiRK on May 14 2021, 11:04.


Group Reviewers
Restricted Project
rABC250c0f75b10a: unbreak windows build

In D9522, I didn't remove all occurences of boost::this_thread::interruption_point();. It did not break the linux build, but it broke the Windows build.
Remove the last remaining occurence of boost::this_thread::interruption_point();.

Test Plan

grep -r "boost::this_thread" src/

ninja all check-all

@bot build-win

Diff Detail

rABC Bitcoin ABC
Lint Not Applicable
Tests Not Applicable

Event Timeline

PiRK requested review of this revision.May 14 2021, 11:05
This revision is now accepted and ready to land.May 14 2021, 11:08

Tail of the build log:

  -t abc-base-image-"${HASH}" debian:buster

(cat <<EOF
results() {
  set +e
  shopt -s dotglob nullglob
  mv /work/abc-ci-builds/"build-win"/* /results
  chown -R ${ME} /work
  chown -R ${ME} /results
  chown -R ${ME} /root/.ccache
trap "results" EXIT
export TEAMCITY_VERSION="2019.2.4 (build 72059)"
export BASE_CACHE="/root/abc-depends/cache"
export SDK_ARCHIVE_DIR="/root/abc-depends/osx-sdk"
export SOURCES_PATH="/root/abc-depends/sources"
mkdir -p "/root/abc-depends/cache" "/root/abc-depends/osx-sdk" "/root/abc-depends/sources"
./contrib/teamcity/ "build-win"
) >
chmod +x

~/infra/docker/ \
  -a "-v /home/teamcity/.ccache:/root/.ccache -v /home/teamcity/.abc-depends:/root/abc-depends -v "${RESULTS_DIR}":/results" \
  -c /work/ abc-base-image-"${HASH}" ./

[11:10:34] :	 [Step 1/1] Starting: /home/teamcity/buildAgent/temp/agentTmp/custom_script5482129549956180538
[11:10:34] :	 [Step 1/1] in directory: /home/teamcity/buildAgent/work/jailed-build
[11:10:34] :	 [Step 1/1] ~/buildAgent/work/jailed-build/bitcoin-abc ~/buildAgent/work/jailed-build
[11:10:34] :	 [Step 1/1] ~/buildAgent/work/jailed-build
[11:10:34] :	 [Step 1/1] Building base image for: c9441d694...
[11:10:34] :	 [Step 1/1] ~/buildAgent/work/jailed-build/bitcoin-abc ~/buildAgent/work/jailed-build
[11:10:37] :	 [Step 1/1] ~/buildAgent/work/jailed-build
[11:10:37] :	 [Step 1/1] Tag name: abc-base-image-c9441d694
[11:11:04]W:	 [Step 1/1] Traceback (most recent call last):
[11:11:04]W:	 [Step 1/1]   File "./contrib/teamcity/", line 573, in <module>
[11:11:04]W:	 [Step 1/1]     main()
[11:11:04]W:	 [Step 1/1]   File "./contrib/teamcity/", line 562, in main
[11:11:04]W:	 [Step 1/1]     script_dir, config_path,
[11:11:04]W:	 [Step 1/1]   File "./contrib/teamcity/", line 59, in __init__
[11:11:04]W:	 [Step 1/1]     self.load(build_name)
[11:11:04]W:	 [Step 1/1]   File "./contrib/teamcity/", line 82, in load
[11:11:04]W:	 [Step 1/1], list(config.keys())
[11:11:04]W:	 [Step 1/1] AssertionError: build-win is not a valid build identifier. Valid identifiers are ['templates', 'builds']
[11:11:04]W:	 [Step 1/1] mv: missing destination file operand after '/results'
[11:11:04]W:	 [Step 1/1] Try 'mv --help' for more information.
[11:11:08]W:	 [Step 1/1] Process exited with code 1
[11:11:09]E:	 [Step 1/1] Process exited with code 1 (Step: Command Line)
[11:11:08]E:	 [Step 1/1] Step Command Line failed
[11:11:09]E: Ant JUnit report watcher
[11:11:09]E:	 [Ant JUnit report watcher] No reports found for paths:
[11:11:09]E:	 [Ant JUnit report watcher] +:results/test_bitcoin.xml
[11:11:09]E:	 [Ant JUnit report watcher] +:results/**/junit_results*.xml
[11:11:09] : Publishing internal artifacts (5s)
[11:11:14] :	 [Publishing internal artifacts] Publishing 1 file using [WebPublisher]
[11:11:14] :	 [Publishing internal artifacts] Publishing 1 file using [ArtifactsCachePublisher]
[11:11:09]W: Publishing artifacts (5s)
[11:11:09] :	 [Publishing artifacts] Collecting files to publish: [+:results/**/junit_results*.xml]
[11:11:09]W:	 [Publishing artifacts] Artifacts path 'results/**/junit_results*.xml' not found
[11:11:16] : Build finished
This revision was automatically updated to reflect the committed changes.