diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2022-09-22 10:21:02 +0530 |
|---|---|---|
| committer | GStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2022-09-23 03:21:33 +0000 |
| commit | e748c8ec6e990c52aeda0638285b8bb611cee574 (patch) | |
| tree | 94c0dd0380d9a1eb5b6e3a64a4d90f04d89e4b30 /ci | |
| parent | 3f93e798dfb21aa7b80b6776ae93f61bff4da026 (diff) | |
Revert "ci: Mark git repositories we import as safe"
This reverts commit b5d16197df384f1fd047f22afec7cedf9882dadf.
Shouldn't be needed now that we have merged a better fix:
https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/923
Fixes https://gitlab.freedesktop.org/gstreamer/cerbero/-/issues/382
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/932>
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/docker_android_setup.sh | 4 | ||||
| -rwxr-xr-x | ci/docker_setup.sh | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/ci/docker_android_setup.sh b/ci/docker_android_setup.sh index 5fe09f8f..aace7823 100755 --- a/ci/docker_android_setup.sh +++ b/ci/docker_android_setup.sh @@ -4,10 +4,6 @@ export ANDROID_HOME=$1 export ANDROID_NDK_HOME=$2 DEFAULT_BRANCH=$3 -# FIXME: might cause problems if the image is used outside CI -# https://github.blog/2022-04-12-git-security-vulnerability-announced/#cve-2022-24765 -git config --global --replace-all safe.directory '*' - mkdir -p /android/sources curl -o /android/sources/android-ndk.zip https://dl.google.com/android/repository/android-ndk-r21-linux-x86_64.zip diff --git a/ci/docker_setup.sh b/ci/docker_setup.sh index 85c391a9..e85fc57f 100755 --- a/ci/docker_setup.sh +++ b/ci/docker_setup.sh @@ -5,10 +5,6 @@ set -e git config --global user.email "cerbero@gstreamer.freedesktop.org" git config --global user.name "Cerbero Build System" -# FIXME: might cause problems if the image is used outside CI -# https://github.blog/2022-04-12-git-security-vulnerability-announced/#cve-2022-24765 -git config --global --replace-all safe.directory '*' - mkdir $HOME/.cerbero echo "allow_parallel_build=True" > $HOME/.cerbero/cerbero.cbc echo "use_ccache=True" >> $HOME/.cerbero/cerbero.cbc |