From 97769ad8cb894e352df23d4116e64314cbefdb1c Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 18 Nov 2025 10:49:02 +0100 Subject: [PATCH] remove internal CACHEDIR env var, it was only used for gradle fdroidserver!1725 gradlew-fdroid!10 --- fdroidserver/build.py | 4 ++-- fdroidserver/build_local_run.py | 16 ++-------------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/fdroidserver/build.py b/fdroidserver/build.py index 63eb0a70..9cc80aca 100644 --- a/fdroidserver/build.py +++ b/fdroidserver/build.py @@ -548,7 +548,7 @@ def build_local(app, build, vcs, build_dir, output_dir, log_dir, srclib_dir, ext cmd += ['-P' + kv for kv in build.gradleprops] cmd += ['clean'] - p = FDroidPopen(cmd, cwd=root_dir, envs={"CACHEDIR": config['cachedir']}) + p = FDroidPopen(cmd, cwd=root_dir) elif bmethod == 'ant': logging.info("Cleaning Ant project...") @@ -701,7 +701,7 @@ def build_local(app, build, vcs, build_dir, output_dir, log_dir, srclib_dir, ext cmd += gradletasks - p = FDroidPopen(cmd, cwd=root_dir, envs={"CACHEDIR": config['cachedir']}) + p = FDroidPopen(cmd, cwd=root_dir) elif bmethod == 'ant': logging.info("Building Ant project...") diff --git a/fdroidserver/build_local_run.py b/fdroidserver/build_local_run.py index 6d7e0948..6e633d4c 100644 --- a/fdroidserver/build_local_run.py +++ b/fdroidserver/build_local_run.py @@ -172,13 +172,7 @@ def init_build(app, build, config): cmd += ['-P' + kv for kv in build.gradleprops] cmd += ['clean'] - p = common.FDroidPopen( - cmd, - cwd=root_dir, - envs={ - "CACHEDIR": config['cachedir'], - }, - ) + p = common.FDroidPopen(cmd, cwd=root_dir) elif bmethod == 'ant': logging.info("Cleaning Ant project...") @@ -415,13 +409,7 @@ def execute_build(app, build, config, gradletasks): cmd += gradletasks - p = common.FDroidPopen( - cmd, - cwd=root_dir, - envs={ - "CACHEDIR": config['cachedir'], - }, - ) + p = common.FDroidPopen(cmd, cwd=root_dir) elif bmethod == 'ant': logging.info("Building Ant project...")