diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2024-03-23 19:03:29 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2024-03-23 19:06:13 +0530 |
| commit | 2e6c6ef708c6d05dadf186e98938eafaf38093d3 (patch) | |
| tree | c1bf551f96fa7a818ada5ccd5f8f1cf0c17eb285 | |
| parent | 63ddc55017cfa70104d6b0548332e8579223e314 (diff) | |
ci: Remove unused CERBERO_OVERRIDDEN_DIST_DIR code
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/1423>
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rwxr-xr-x | ci/cerbero_setup.sh | 10 |
2 files changed, 0 insertions, 12 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2698fb11..857fd7c5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -184,8 +184,6 @@ android fedora image: CERBERO_RUN_SUFFIX: "" # '.exe' on cross-winXX CERBERO_BOOTSTRAP_SYSTEM: "no" HAVE_CCACHE: "yes" - # used by macos packages as we only ever install to a fixed directory - CERBERO_OVERRIDDEN_DIST_DIR: "" # location where the cerbero git repo is stored on the image CERBERO_HOST_DIR: "/" before_script: diff --git a/ci/cerbero_setup.sh b/ci/cerbero_setup.sh index ff29e1f8..f40f8221 100755 --- a/ci/cerbero_setup.sh +++ b/ci/cerbero_setup.sh @@ -110,11 +110,6 @@ cerbero_script() { $CERBERO $CERBERO_ARGS fetch-cache --branch "${GST_UPSTREAM_BRANCH}" - if [[ -n ${CERBERO_OVERRIDDEN_DIST_DIR} && -d "${CERBERO_HOME}/dist/${ARCH}" ]]; then - mkdir -p "${CERBERO_OVERRIDDEN_DIST_DIR}" - time rsync -aH "${CERBERO_HOME}/dist/${ARCH}/" "${CERBERO_OVERRIDDEN_DIST_DIR}" - fi - $CERBERO $CERBERO_ARGS bootstrap --offline --system=$CERBERO_BOOTSTRAP_SYSTEM fix_build_tools @@ -149,11 +144,6 @@ cerbero_deps_script() { $CERBERO $CERBERO_ARGS build-deps --offline $build_deps $CERBERO $CERBERO_ARGS build --offline $more_deps - if [[ -n ${CERBERO_OVERRIDDEN_DIST_DIR} ]]; then - mkdir -p "${CERBERO_HOME}/dist/${ARCH}" - time rsync -aH "${CERBERO_OVERRIDDEN_DIST_DIR}/" "${CERBERO_HOME}/dist/${ARCH}" - fi - # Check that the env var is set. Don't expand this protected variable by # doing something silly like [[ -n ${CERBERO_...} ]] because it will get # printed in the CI logs due to set -x |