diff options
| author | Andoni Morales Alastruey <amorales@fluendo.com> | 2021-11-16 16:30:27 +0000 |
|---|---|---|
| committer | Andoni Morales Alastruey <ylatuya@gmail.com> | 2022-03-04 11:09:07 +0100 |
| commit | 96dc5ea4b817f05e7ead8e21454823fd90ac1e7a (patch) | |
| tree | 1a06bdc8e707233803411438fedbbb2995a3409d | |
| parent | 5e5edd6f053ef1e863b3eb7fa1e3338438266541 (diff) | |
ci: bootstrap system for msys shell
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/743>
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rwxr-xr-x | ci/cerbero_setup.sh | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e12c758c..47c1c0e0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -133,6 +133,7 @@ android fedora image: CERBERO_PACKAGE_ARGS: "-t" CERBERO_RUN_WRAPPER: "" # 'wine' on cross-winXX 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: "" @@ -475,6 +476,7 @@ cerbero cross-ios universal examples: CERBERO_HOST_DIR: "C:/cerbero" CERBERO_ARGS: "${DEFAULT_CERBERO_ARGS} -v visualstudio -v nowerror" CERBERO_RUN_SUFFIX: ".exe" + CERBERO_BOOTSTRAP_SYSTEM: "yes" HAVE_CCACHE: "" before_script: - $env:CI_PROJECT_DIR = $env:CI_PROJECT_DIR.replace('\', '/') diff --git a/ci/cerbero_setup.sh b/ci/cerbero_setup.sh index 79e70a63..580a4823 100755 --- a/ci/cerbero_setup.sh +++ b/ci/cerbero_setup.sh @@ -148,7 +148,7 @@ cerbero_deps_script() { $CERBERO $CERBERO_ARGS show-config $CERBERO $CERBERO_ARGS fetch-bootstrap --jobs=4 $CERBERO $CERBERO_ARGS fetch-package --jobs=4 --deps gstreamer-1.0 - $CERBERO $CERBERO_ARGS bootstrap --offline --system=no + $CERBERO $CERBERO_ARGS bootstrap --offline --system=$CERBERO_BOOTSTRAP_SYSTEM $CERBERO $CERBERO_ARGS build-deps --offline $build_deps $CERBERO $CERBERO_ARGS build --offline $more_deps |