Forráskód Böngészése

Migate to Qt 5.15.2 in CI

- Migate to the last OSS release of Qt 5
Alexey Edelev 3 éve
szülő
commit
7c6966cae1

+ 3 - 3
.ci/Dockerfile.opensuse

@@ -2,8 +2,8 @@ FROM qtprotobuf/opensuse-latest-qt:latest
 ADD . /sources
 RUN mkdir -p /build
 WORKDIR /build
-ENV PATH=/qt/5.13.2/gcc_64/bin:$PATH
-RUN cmake ../sources -DCMAKE_PREFIX_PATH="/qt/5.13.2/gcc_64/lib/cmake" -DBUILD_SHARED_LIBS=ON
+ENV PATH=/qt/5.15.2/gcc_64/bin:$PATH
+RUN cmake ../sources -DCMAKE_PREFIX_PATH="/qt/5.15.2/gcc_64/lib/cmake" -DBUILD_SHARED_LIBS=ON
 RUN cmake --build . --config RELEASE
-ENV QT_PLUGIN_PATH=/qt/5.13.2/gcc_64/plugins
+ENV QT_PLUGIN_PATH=/qt/5.15.2/gcc_64/plugins
 ENV QT_QPA_PLATFORM=minimal

+ 3 - 3
.ci/Dockerfile.opensuse_static

@@ -2,8 +2,8 @@ FROM qtprotobuf/opensuse-latest-qt:latest
 ADD . /sources
 RUN mkdir -p /build
 WORKDIR /build
-ENV PATH=/qt/5.13.2/gcc_64/bin:$PATH
-RUN cmake ../sources -DCMAKE_PREFIX_PATH="/qt/5.13.2/gcc_64/lib/cmake" -DBUILD_SHARED_LIBS=OFF
+ENV PATH=/qt/5.15.2/gcc_64/bin:$PATH
+RUN cmake ../sources -DCMAKE_PREFIX_PATH="/qt/5.15.2/gcc_64/lib/cmake" -DBUILD_SHARED_LIBS=OFF
 RUN cmake --build . --config RELEASE
-ENV QT_PLUGIN_PATH=/qt/5.13.2/gcc_64/plugins
+ENV QT_PLUGIN_PATH=/qt/5.15.2/gcc_64/plugins
 ENV QT_QPA_PLATFORM=minimal

+ 3 - 3
.ci/Dockerfile.ubuntu

@@ -2,8 +2,8 @@ FROM qtprotobuf/ubuntu-latest-qt:latest
 ADD . /sources
 RUN mkdir -p /build
 WORKDIR /build
-ENV PATH=/qt/5.13.2/gcc_64/bin:$PATH
-RUN cmake ../sources -DCMAKE_PREFIX_PATH="/qt/5.13.2/gcc_64/lib/cmake" -DBUILD_SHARED_LIBS=ON
+ENV PATH=/qt/5.15.2/gcc_64/bin:$PATH
+RUN cmake ../sources -DCMAKE_PREFIX_PATH="/qt/5.15.2/gcc_64/lib/cmake" -DBUILD_SHARED_LIBS=ON
 RUN cmake --build . --config RELEASE
-ENV QT_PLUGIN_PATH=/qt/5.13.2/gcc_64/plugins
+ENV QT_PLUGIN_PATH=/qt/5.15.2/gcc_64/plugins
 ENV QT_QPA_PLATFORM=minimal

+ 3 - 3
.ci/Dockerfile.ubuntu_static

@@ -2,8 +2,8 @@ FROM qtprotobuf/ubuntu-latest-qt:latest
 ADD . /sources
 RUN mkdir -p /build
 WORKDIR /build
-ENV PATH=/qt/5.13.2/gcc_64/bin:$PATH
-RUN cmake ../sources -DCMAKE_PREFIX_PATH="/qt/5.13.2/gcc_64/lib/cmake" -DBUILD_SHARED_LIBS=OFF
+ENV PATH=/qt/5.15.2/gcc_64/bin:$PATH
+RUN cmake ../sources -DCMAKE_PREFIX_PATH="/qt/5.15.2/gcc_64/lib/cmake" -DBUILD_SHARED_LIBS=OFF
 RUN cmake --build . --config RELEASE
-ENV QT_PLUGIN_PATH=/qt/5.13.2/gcc_64/plugins
+ENV QT_PLUGIN_PATH=/qt/5.15.2/gcc_64/plugins
 ENV QT_QPA_PLATFORM=minimal