Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix too many parallel build jobs in appimage build #608

Merged
merged 1 commit into from
Mar 12, 2024
Merged

Fix too many parallel build jobs in appimage build #608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions scripts/appimage/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ RUN wget https://download.qt.io/official_releases/qt/5.15/${QT_VERSION}/single/q
-skip qtpurchasing -skip qtserialbus -skip qtserialport -skip qtwebchannel -skip qtwebglplugin \
-skip qtwebview -skip qtlocation -skip qtspeech -skip qtwinextras \
-release -ssl -no-compile-examples -cups -I /usr/include/openssl11 -prefix /usr && \
make -j && make install && cd .. && rm -Rf build qt-everywhere-*
make -j$(nproc) && make install && cd .. && rm -Rf build qt-everywhere-*

# appimage build tools
RUN wget https://github.com/linuxdeploy/linuxdeploy/releases/download/1-alpha-20230713-1/linuxdeploy-x86_64.AppImage && chmod +x linuxdeploy-x86_64.AppImage && \
Expand All @@ -74,7 +74,7 @@ RUN cd /opt && mkdir qcustomplot && cd qcustomplot && \
cd qcustomplot && cp qcustomplot.h /usr/include && \
wget https://www.qcustomplot.com/release/${QCustomPlot_VERSION}/QCustomPlot-sharedlib.tar.gz && \
tar -xf QCustomPlot-sharedlib.tar.gz && ls && cd qcustomplot-sharedlib/sharedlib-compilation \
&& qmake . && make -j && mv libqcustomplot.so* /usr/lib && cd /opt && rm -Rf qcustomplot && ldconfig
&& qmake . && make -j$(nproc) && mv libqcustomplot.so* /usr/lib && cd /opt && rm -Rf qcustomplot && ldconfig

# rust demangle
RUN cd /opt/ && mkdir rust && cd rust && wget https://sh.rustup.rs -O rustup.sh && \
Expand Down Expand Up @@ -125,7 +125,7 @@ RUN ldconfig && \
# kddockwidgets
RUN cd /opt && git clone --recursive https://github.com/KDAB/KDDockWidgets.git -b ${KDDockWidgets_VERSION} && \
cd KDDockWidgets && mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX=/usr -DKDDockWidgets_EXAMPLES=0 -DKDDockWidgets_FRONTENDS="qtwidgets" .. && \
make -j && make install && cd /opt && rm -Rf KDDockWidgets
make -j$(nproc) && make install && cd /opt && rm -Rf KDDockWidgets

FROM intermediate

Expand Down
2 changes: 1 addition & 1 deletion scripts/appimage/build_appimage.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_DISABLE_FIND_PACKAGE_KGraphViewerPart=ON \
-DAPPIMAGE_BUILD=ON "-DCMAKE_INSTALL_PREFIX=/usr" "$srcdir"

make -j
make -j$(nproc)
DESTDIR=appdir make install

tar -cjvf "/output/hotspot-debuginfo-$gitversion-x86_64.tar.bz2" \
Expand Down
2 changes: 1 addition & 1 deletion scripts/compile-test/BuildDependenciesQt6
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN wget https://www.qcustomplot.com/release/2.1.1/QCustomPlot-source.tar.gz &&
cp -va qcustomplot.h /usr/include/ && \
wget https://www.qcustomplot.com/release/2.1.1/QCustomPlot-sharedlib.tar.gz && \
tar -xf QCustomPlot-sharedlib.tar.gz && cd qcustomplot-sharedlib/sharedlib-compilation && \
qmake6 CONFIG+=release CONFIG+=force_debug_info && make -j && \
qmake6 CONFIG+=release CONFIG+=force_debug_info && make -j$(nproc) && \
cp -va libqcustomplot* /usr/lib/x86_64-linux-gnu/ && cd /opt && rm -Rf qcustomplot-source

RUN git clone -b $KDDOCKWIDGETS_VERSION https://github.com/KDAB/KDDockWidgets && \
Expand Down
Loading