mirror of
https://github.com/f-droid/fdroidserver.git
synced 2026-03-26 02:43:42 -04:00
remove internal CACHEDIR env var, it was only used for gradle
fdroidserver!1725 gradlew-fdroid!10
This commit is contained in:
committed by
Michael Pöhn
parent
303d038de9
commit
97769ad8cb
@@ -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...")
|
||||
|
||||
@@ -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...")
|
||||
|
||||
Reference in New Issue
Block a user