From ecdf9db906b4d09e780371fd6e7fe420ecdc87f9 Mon Sep 17 00:00:00 2001 From: David Gumberg Date: Tue, 8 Sep 2026 22:13:03 +0000 Subject: [PATCH] test: get_previous_releases.py use `PREVIOUS_RELEASES_DIR` `test_framework.py` already uses `PREVIOUS_RELEASES_DIR` to set a default directory to find previous releases, so should `get_previous_releases.py` when fetching them. This is more convenient for local development when using multiple worktrees where having `$PREVIOUS_RELEASES_DIR` set is useful. Also allows some CI code to get deleted. --- .github/ci-windows-cross.py | 3 --- ci/test/03_test_script.sh | 2 +- test/get_previous_releases.py | 7 ++++++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/ci-windows-cross.py b/.github/ci-windows-cross.py index 355d8fb78d9..936e52acbc7 100755 --- a/.github/ci-windows-cross.py +++ b/.github/ci-windows-cross.py @@ -99,12 +99,9 @@ def prepare_tests(): content = "\n".join(lines) + "\n" config_path.write_text(content) print(content) - previous_releases_dir = Path(os.environ["PREVIOUS_RELEASES_DIR"]) cmd_download_prev_rel = [ sys.executable, str(workspace / "test" / "get_previous_releases.py"), - "--target-dir", - str(previous_releases_dir), ] run(cmd_download_prev_rel) run([sys.executable, "-m", "pip", "install", "pyzmq"]) diff --git a/ci/test/03_test_script.sh b/ci/test/03_test_script.sh index 3a19838624f..e9a78c28d28 100755 --- a/ci/test/03_test_script.sh +++ b/ci/test/03_test_script.sh @@ -96,7 +96,7 @@ if [ -z "$NO_DEPENDS" ]; then bash -c "$SHELL_OPTS make $MAKEJOBS -C depends HOST=$HOST $DEP_OPTS LOG=1" fi if [ "$DOWNLOAD_PREVIOUS_RELEASES" = "true" ]; then - test/get_previous_releases.py --target-dir "$PREVIOUS_RELEASES_DIR" + test/get_previous_releases.py fi BITCOIN_CONFIG_ALL="-DCMAKE_COMPILE_WARNING_AS_ERROR=ON -DBUILD_BENCH=ON -DBUILD_FUZZ_BINARY=ON" diff --git a/test/get_previous_releases.py b/test/get_previous_releases.py index cd77c55e461..083e350f229 100755 --- a/test/get_previous_releases.py +++ b/test/get_previous_releases.py @@ -262,10 +262,15 @@ if __name__ == '__main__': depends/README.md for which a release exists. ''', ) + previous_releases_path = os.getenv("PREVIOUS_RELEASES_DIR") or os.getcwd() + "/releases" parser.add_argument('-r', '--remove-dir', action='store_true', help='remove existing directory.') parser.add_argument('-t', '--target-dir', action='store', - help='target directory.', default='releases') + default=previous_releases_path, + help='target directory, defaults to ' + 'environment\'s PREVIOUS_RELEASES_DIR if set, ' + 'otherwise to "./releases".' + ) all_tags = sorted([*set([v['tag'] for v in SHA256_SUMS.values()])]) parser.add_argument('tags', nargs='*', default=all_tags, help='release tags. e.g.: v0.18.1 v0.20.0rc2 '