From c74c5462a225780794fd05af25781eb474d5ede6 Mon Sep 17 00:00:00 2001 From: Kim Neunert Date: Fri, 1 Jul 2022 13:08:16 +0200 Subject: [PATCH 1/7] fix the broken build cache for bitcoind --- .cirrus.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.cirrus.yml b/.cirrus.yml index 44ac843fc5..07833df7fb 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -12,6 +12,8 @@ prep_stuff_template: &PREP_STUFF_TEMPLATE - cat pytest.ini | grep "addopts = " | cut -d'=' -f2 | sed 's/--/+/g' | tr '+' '\n' | grep bitcoin | cut -d' ' -f2 - cat tests/bitcoin_gitrev_pinned 2> /dev/null || true - cat /etc/os-release | grep VERSION + - cat ./tests/install_noded.sh + - echo "binary" # if the next line is --binary, otherwise compile. Not doing that correctly will break a proper caching switching between both populate_script: ./tests/install_noded.sh --debug --bitcoin binary elementsd_installation_cache: folder: ./tests/elements @@ -19,6 +21,8 @@ prep_stuff_template: &PREP_STUFF_TEMPLATE - cat pytest.ini | grep "addopts = " | cut -d'=' -f2 | sed 's/--/+/g' | tr '+' '\n' | grep elements | cut -d' ' -f2 - cat tests/elements_gitrev_pinned 2> /dev/null || true - cat /etc/os-release | grep VERSION + - cat ./tests/install_noded.sh + - echo "binary" # if the next line is --binary, otherwise compile. Not doing that correctly will break a proper caching switching between both populate_script: ./tests/install_noded.sh --debug --elements binary verify_script: - echo " --> Version of python, virtualenv and pip3" From db489a59d13c7cec31847c79f71a7e757dc36cbe Mon Sep 17 00:00:00 2001 From: Kim Neunert Date: Fri, 1 Jul 2022 13:16:02 +0200 Subject: [PATCH 2/7] fix install_noded --- tests/install_noded.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/install_noded.sh b/tests/install_noded.sh index a0e1d09fa7..471725d25c 100755 --- a/tests/install_noded.sh +++ b/tests/install_noded.sh @@ -259,7 +259,7 @@ function sub_binary { find ./"$node_impl"/bin -maxdepth 1 -type f -executable -exec ls -ld {} \; fi echo " --> checking for ${node_impl}d" - test -x ./bitcoin/bin/${node_impl}d || exit 2 + test -x ./${node_impl}/bin/${node_impl}d || exit 2 echo " --> Finished installing ${node_impl}d binary" END=$(date +%s) DIFF=$(echo "$END - $START" | bc) From 216036eb0d7b91db3befd67f175cbaefcf5f49bd Mon Sep 17 00:00:00 2001 From: Kim Neunert Date: Fri, 1 Jul 2022 13:19:39 +0200 Subject: [PATCH 3/7] fix cirrus script --- .cirrus.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 07833df7fb..fd1515be28 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -28,7 +28,9 @@ prep_stuff_template: &PREP_STUFF_TEMPLATE - echo " --> Version of python, virtualenv and pip3" - python3 --version && virtualenv --version && pip3 --version - echo " --> Executables in tests/elements/src" - - find tests/elements/src -maxdepth 1 -type f -executable -exec ls -ld {} \; + - find tests/elements/src -maxdepth 1 -type f -executable -exec ls -ld {} \; || true + - echo " --> Executables in tests/elements/bin" + - find tests/elements/bin -maxdepth 1 -type f -executable -exec ls -ld {} \; || true - echo " --> Executables in tests/bitcoin/src" - find tests/bitcoin/src -maxdepth 1 -type f -executable -exec ls -ld {} \; || true - echo " --> Executables in tests/bitcoin/bin" From 8d8866dfd5d562c07f3b4dd7ca3e86b6cf6cb879 Mon Sep 17 00:00:00 2001 From: Kim Neunert Date: Fri, 1 Jul 2022 13:25:08 +0200 Subject: [PATCH 4/7] fix cirrus script part 2 --- .cirrus.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index fd1515be28..82ef7c54d1 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -39,7 +39,8 @@ prep_stuff_template: &PREP_STUFF_TEMPLATE - tests/bitcoin/src/bitcoind -version | head -1 || true - tests/bitcoin/bin/bitcoind -version | head -1 || true - echo " --> elements version" - - tests/elements/src/elementsd -version | head -1 + - tests/elements/src/elementsd -version | head -1 || true + - tests/elements/bin/elementsd -version | head -1 || true pip_script: #folder: /tmp/cirrus-ci-build/.env From cd56ce9a1a6e215f6c363fc4f6e9b5e0e180aa72 Mon Sep 17 00:00:00 2001 From: Kim Neunert Date: Fri, 1 Jul 2022 13:28:30 +0200 Subject: [PATCH 5/7] fix cirrus script part3 --- .cirrus.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 82ef7c54d1..d9084ec15b 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -50,7 +50,6 @@ prep_stuff_template: &PREP_STUFF_TEMPLATE - source ./.env/bin/activate - pip3 install -r requirements.txt --require-hashes && pip3 install -r test_requirements.txt install_script: - - ls -l ./tests/elements/src/ - source ./.env/bin/activate - pip3 install -e . From c0e268e6689f643235817c80c275a902643c8353 Mon Sep 17 00:00:00 2001 From: k9ert Date: Sat, 2 Jul 2022 11:01:41 +0200 Subject: [PATCH 6/7] Update .cirrus.yml Co-authored-by: Manolis Mandrapilias <70536101+moneymanolis@users.noreply.github.com> --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index d9084ec15b..ba35ea4276 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -22,7 +22,7 @@ prep_stuff_template: &PREP_STUFF_TEMPLATE - cat tests/elements_gitrev_pinned 2> /dev/null || true - cat /etc/os-release | grep VERSION - cat ./tests/install_noded.sh - - echo "binary" # if the next line is --binary, otherwise compile. Not doing that correctly will break a proper caching switching between both + - echo "binary" # if the next line is --elements binary, otherwise use echo "compile" - this ensures different caching keys. populate_script: ./tests/install_noded.sh --debug --elements binary verify_script: - echo " --> Version of python, virtualenv and pip3" From 3f033761276c741049649092ad506e75dffd6413 Mon Sep 17 00:00:00 2001 From: k9ert Date: Sat, 2 Jul 2022 11:01:49 +0200 Subject: [PATCH 7/7] Update .cirrus.yml Co-authored-by: Manolis Mandrapilias <70536101+moneymanolis@users.noreply.github.com> --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index ba35ea4276..dc391a9e5a 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -13,7 +13,7 @@ prep_stuff_template: &PREP_STUFF_TEMPLATE - cat tests/bitcoin_gitrev_pinned 2> /dev/null || true - cat /etc/os-release | grep VERSION - cat ./tests/install_noded.sh - - echo "binary" # if the next line is --binary, otherwise compile. Not doing that correctly will break a proper caching switching between both + - echo "binary" # if the next line is --bitcoin binary, otherwise use echo "compile" - this ensures different caching keys. populate_script: ./tests/install_noded.sh --debug --bitcoin binary elementsd_installation_cache: folder: ./tests/elements