From 21189b0e5b588c94529ec4674386c68f733590aa Mon Sep 17 00:00:00 2001 From: Robert Löhning Date: Mon, 20 Dec 2021 19:42:36 +0100 Subject: [qt] Clone the latest combination of qtbase and qtsvg which passed upstream CI (#7017) * [qt] Clone sources according to qtsvg's latest dependencies qtsvg/depencies.yaml contains the latest revision of qtbase which qtsvg was successfully tested with. This is usually much newer than the submodules in qt5. * [qt] Still keep the old source checkout * Empty commit to trigger github actions --- projects/qt/Dockerfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/projects/qt/Dockerfile b/projects/qt/Dockerfile index 4d5e91df..b1e164ef 100644 --- a/projects/qt/Dockerfile +++ b/projects/qt/Dockerfile @@ -20,9 +20,14 @@ RUN git clone --depth 1 https://github.com/AFLplusplus/AFLplusplus.git myaflplus cp -r myaflplusplus/dictionaries afldictionaries && \ cp -r myaflplusplus/testcases afltestcases && \ rm -rf myaflplusplus +# Still keep the old source checkout until the build script was updated RUN git clone --branch dev --depth 1 --shallow-submodules \ --recurse-submodules=qtbase \ --recurse-submodules=qtsvg \ git://code.qt.io/qt/qt5.git qt +# Prepare new sources using dependencies.yaml +RUN cp -r qt/cmake . +RUN git clone --branch dev --depth 1 git://code.qt.io/qt/qtsvg.git +RUN cmake -DSYNC_TO_MODULE=qtsvg -DSYNC_TO_BRANCH=dev -P cmake/QtSynchronizeRepo.cmake RUN git clone --branch dev --depth 1 git://code.qt.io/qt/qtqa.git RUN cp qtqa/fuzzing/oss-fuzz/build.sh $SRC/ -- cgit v1.2.3