diff options
| author |  Robert Löhning <robert.loehning@qt.io> | 2021-12-20 19:42:36 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2021-12-20 18:42:36 +0000 |
| commit | 21189b0e5b588c94529ec4674386c68f733590aa (patch) | |
| tree | 9f1f0ed2ee95795cd5d137314940cc91a593f46d | |
| parent | aef7c2c87345ab717f89144ea1b796326b35af1a (diff) | |
[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
| -rw-r--r-- | projects/qt/Dockerfile | 5 |
1 files changed, 5 insertions, 0 deletions
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/ |