docker/cerbero: Do not remove toolchain downloads
authorNirbheek Chauhan <nirbheek@centricular.com>
Wed, 23 Sep 2020 08:48:57 +0000 (14:18 +0530)
committerNirbheek Chauhan <nirbheek@centricular.com>
Wed, 23 Sep 2020 08:48:57 +0000 (14:18 +0530)
We will use these when running bootstrap in the actual jobs.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-ci/-/merge_requests/350>

docker/cerbero/Dockerfile-fedora
docker/windows/prepare_cerbero_env.sh

index dad3e99..b11f628 100644 (file)
@@ -33,8 +33,6 @@ RUN git clone -b ${DEFAULT_BRANCH} https://gitlab.freedesktop.org/gstreamer/cerb
       ./cerbero-uninstalled -t -c localconf.cbc -c config/cross-android-universal.cbc fetch-package gstreamer-1.0 && \
       ./cerbero-uninstalled -t -c localconf.cbc -c config/cross-android-universal.cbc bootstrap -y --build-tools=no --toolchains=no && \
       cd .. && \
-    rm /cerbero/cerbero-sources/android-ndk-*.zip && \
-    rm /cerbero/cerbero-sources/mingw-*.tar.xz && \
     rm -rf /cerbero/cerbero-build/{dist,logs,sources} && \
     rm -f /cerbero/cerbero-build/{linux,windows,android}*.cache && \
     dnf clean all
index 7cafe09..7eafd2e 100644 (file)
@@ -21,8 +21,6 @@ echo 'vs_install_version = "vs15"' >> localconf.cbc
 # Fixup the MSYS installation
 ./cerbero-uninstalled -t -c localconf.cbc -c config/win64.cbc bootstrap -y --build-tools=no --toolchains=no --offline
 
-# Delete mingw toolchain binary tarball
-rm /c/cerbero/cerbero-sources/mingw-*.tar.xz
 # Wipe visualstudio package dist, sources, logs, and the build tools recipes
 ./cerbero-uninstalled -t -v visualstudio -c localconf.cbc -c config/win64.cbc wipe --force --build-tools
 # clean the localconf