rm config.buildserver.yml, ANDROID_HOME set in /etc/profile.d/bsenv.sh

`fdroid build_local_run` has been running without this for a long time.
This commit is contained in:
Hans-Christoph Steiner
2025-11-18 10:56:19 +01:00
committed by Michael Pöhn
parent 97769ad8cb
commit 171cf77cc3
5 changed files with 0 additions and 18 deletions

View File

@@ -1,4 +1,3 @@
include buildserver/config.buildserver.yml
include buildserver/provision-android-ndk
include buildserver/provision-android-sdk
include buildserver/provision-apt-get-install

View File

@@ -1 +0,0 @@
sdk_path: /opt/android-sdk

View File

@@ -155,10 +155,6 @@ def build_server(app, build, vcs, build_dir, output_dir, log_dir, force):
send_dir(os.path.join(serverpath))
ftp.chdir(homedir)
ftp.put(os.path.join(serverpath, '..', 'buildserver',
'config.buildserver.yml'), 'config.yml')
ftp.chmod('config.yml', 0o600)
# Copy over the ID (head commit hash) of the fdroidserver in use...
with open(os.path.join(os.getcwd(), 'tmp', 'fdroidserverid'), 'wb') as fp:
fp.write(subprocess.check_output(['git', 'rev-parse', 'HEAD'],

View File

@@ -55,9 +55,6 @@ def get_data_files():
data_files.append(
('share/doc/fdroidserver/examples', re.findall(r'include (examples/.*)', data))
)
data_files.append(
('share/doc/fdroidserver/examples', ['buildserver/config.buildserver.yml'])
)
for d in re.findall(r'include (locale/.*)/fdroidserver\.po', data):
data_files.append(('share/' + d, [d + '/fdroidserver.mo']))

View File

@@ -2145,15 +2145,6 @@ class CommonTest(SetUpTearDownMixin, unittest.TestCase):
config = {'sdk_path': self.testdir}
self.assertFalse(fdroidserver.common.test_sdk_exists(config))
def test_loading_config_buildserver_yml(self):
"""Smoke check to make sure this file is properly parsed"""
os.chdir(self.testdir)
shutil.copy(
os.path.join(basedir, '..', 'buildserver', 'config.buildserver.yml'),
fdroidserver.common.CONFIG_FILE,
)
fdroidserver.common.read_config()
@mock.patch.dict(os.environ, {'PATH': os.getenv('PATH')}, clear=True)
def test_config_with_env_string(self):
"""Test whether env works in keys with string values."""