diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2024-03-24 02:18:29 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2024-03-24 03:15:33 +0530 |
| commit | cbb87d89e796be3db5c2575c39f6199a1466b212 (patch) | |
| tree | 06449dd17daf4d68bac3dd30799e7d53ab86517b | |
| parent | 7aef890e474921ed7882417f233173a8398f1bed (diff) | |
ci: Remove some hard-coded cerbero homedir
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/1423>
| -rw-r--r-- | cerbero/commands/cache.py | 3 | ||||
| -rwxr-xr-x | ci/cerbero_setup.sh | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/cerbero/commands/cache.py b/cerbero/commands/cache.py index 5b7b02ae..b76d3552 100644 --- a/cerbero/commands/cache.py +++ b/cerbero/commands/cache.py @@ -60,7 +60,8 @@ class BaseCache(Command): def get_cache_home_dir(self, config, namespace): ci_builds_dir = self.get_ci_builds_dir(config) - return f'{ci_builds_dir}/{namespace}/cerbero/cerbero-build' + ci_home_dir = os.environ.get('CERBERO_HOME', 'cerbero-build') + return f'{ci_builds_dir}/{namespace}/cerbero/{ci_home_dir}' def get_gnu_sed(self, config): if config.platform == Platform.DARWIN: diff --git a/ci/cerbero_setup.sh b/ci/cerbero_setup.sh index f40f8221..ef294f82 100755 --- a/ci/cerbero_setup.sh +++ b/ci/cerbero_setup.sh @@ -67,7 +67,7 @@ cerbero_before_script() { echo "home_dir = \"$(pwd_native)/${CERBERO_HOME}\"" > localconf.cbc echo "local_sources = \"$(pwd_native)/${CERBERO_SOURCES}\"" >> localconf.cbc - echo "mingw_perl_prefix = \"${CERBERO_HOST_DIR}/cerbero-build/mingw/perl\"" >> localconf.cbc + echo "mingw_perl_prefix = \"${CERBERO_HOST_DIR}/${CERBERO_HOME}/mingw/perl\"" >> localconf.cbc if [[ $CONFIG == win??.cbc ]] || [[ $CONFIG =~ uwp ]] ; then # Visual Studio 2022 build tools install path echo 'vs_install_path = "C:/BuildTools"' >> localconf.cbc |