From 43f822305984b6b8d461952ae02a4d15758202af Mon Sep 17 00:00:00 2001 From: Konstantin Akimov Date: Mon, 8 Jan 2024 16:42:50 +0700 Subject: [PATCH] debug fixup --- .gitlab-ci.yml | 19 +++++++++++-------- ci/dash/build_src.sh | 3 +++ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 65c54348a3d9eb..344cda7ca7d207 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -120,6 +120,9 @@ builder-image: script: - ./ci/dash/build_src.sh - ./ci/dash/test_unittests.sh # Run unit tests in build stage to avoid creating too many parallel jobs + - echo pwd=$PWD + - echo build=$BASE_BUILD_DIR + - echo root=$BASE_ROOT_DIR cache: # Let all branches share the same cache, which is ok because ccache is able to handle it key: @@ -132,16 +135,16 @@ builder-image: name: binaries when: always paths: - - build-ci + - $BASE_BUILD_DIR # Exclude some less important binaries to reduce the size of the artifacts exclude: - - build-ci/dashcore-$BUILD_TARGET/src/bench/bench_dash - - build-ci/dashcore-$BUILD_TARGET/src/bench/bench_dash.exe - - build-ci/dashcore-$BUILD_TARGET/src/qt/test/test_dash-qt - - build-ci/dashcore-$BUILD_TARGET/src/qt/test/test_dash-qt.exe - - build-ci/dashcore-$BUILD_TARGET/src/test/test_dash - - build-ci/dashcore-$BUILD_TARGET/src/test/test_dash.exe - - build-ci/dashcore-$BUILD_TARGET/src/test/fuzz/* + - $BASE_BUILD_DIR/dashcore-$BUILD_TARGET/src/bench/bench_dash + - $BASE_BUILD_DIR/dashcore-$BUILD_TARGET/src/bench/bench_dash.exe + - $BASE_BUILD_DIR/dashcore-$BUILD_TARGET/src/qt/test/test_dash-qt + - $BASE_BUILD_DIR/dashcore-$BUILD_TARGET/src/qt/test/test_dash-qt.exe + - $BASE_BUILD_DIR/dashcore-$BUILD_TARGET/src/test/test_dash + - $BASE_BUILD_DIR/dashcore-$BUILD_TARGET/src/test/test_dash.exe + - $BASE_BUILD_DIR/dashcore-$BUILD_TARGET/src/test/fuzz/* expire_in: 3 days .test-template: diff --git a/ci/dash/build_src.sh b/ci/dash/build_src.sh index 1e68572b3696bc..eee431c437dc3e 100755 --- a/ci/dash/build_src.sh +++ b/ci/dash/build_src.sh @@ -41,6 +41,9 @@ BITCOIN_CONFIG_ALL="--enable-suppress-external-warnings --disable-dependency-tra ( test -n "$CONFIG_SHELL" && eval '"$CONFIG_SHELL" -c "./autogen.sh"' ) || ./autogen.sh +echo "pwd: $PWD" +echo "base build: $BASE_BUILD_DIR" +echo "base root: $BASE_ROOT_DIR" rm -rf "${BASE_BUILD_DIR}" mkdir -p "${BASE_BUILD_DIR}" cd "${BASE_BUILD_DIR}"