From f35938d437d3de5dcd0828473878457168c82bd9 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Mon, 3 Feb 2025 16:43:22 +0100 Subject: [PATCH] CI: try to fix ubuntu armv7 build --- .github/workflows/ci_linux_ubuntu.yml | 5 +++- .github/workflows/ci_linux_ubuntu_armv7.yml | 26 ++++++++++++++++----- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci_linux_ubuntu.yml b/.github/workflows/ci_linux_ubuntu.yml index 655a8d84..01c2570d 100644 --- a/.github/workflows/ci_linux_ubuntu.yml +++ b/.github/workflows/ci_linux_ubuntu.yml @@ -16,9 +16,12 @@ jobs: - name: Checkout uses: actions/checkout@v2 - - name: Install Qt${{matrix.qt_version_major}} + - name: Update all package informations run: | sudo apt-get -y update + + - name: Install Qt${{matrix.qt_version_major}} + run: | if [[ ${{matrix.qt_version_major}} == "5" ]]; then sudo apt-get -y install qtbase5-dev libqt5svg5-dev elif [[ ${{matrix.qt_version_major}} == "6" ]]; then diff --git a/.github/workflows/ci_linux_ubuntu_armv7.yml b/.github/workflows/ci_linux_ubuntu_armv7.yml index 68625ab8..f8558aba 100644 --- a/.github/workflows/ci_linux_ubuntu_armv7.yml +++ b/.github/workflows/ci_linux_ubuntu_armv7.yml @@ -31,14 +31,25 @@ jobs: install: | apt-get -y update - apt-get -y install xvfb # Needed to run unit tests - apt-get -y install cmake - apt-get -y install git - apt-get -y install g++ + + apt-get -y install cmake git g++ + + # Needed to run unit tests + apt-get -y install xvfb + + # Install Qt5 apt-get -y install qtbase5-dev libqt5svg5-dev - apt-get -y install libxcb-cursor0 # Dependencies for "xcb" Qt plugin(actually needed for Qt6) + + # Dependencies for "xcb" Qt plugin(actually needed for Qt6) + apt-get -y install libxcb-cursor0 + + # Install OpenCascade apt-get -y install libocct-data-exchange-dev libocct-draw-dev occt-misc - apt-get -y install libtbb-dev libxi-dev # Dependencies for OpenCascade + + # Dependencies for OpenCascade + apt-get -y install libtbb-dev libxi-dev + + # Install Assimp apt-get -y install libassimp-dev env: | @@ -59,6 +70,9 @@ jobs: mkdir build cd build + dpkg -L libocct-data-exchange-dev | grep so + dpkg -L libocct-data-exchange-dev | grep cmake + cmake .. -DMayo_BuildTests=ON -DMayo_BuildPluginAssimp=ON cmake --build . --config Release --parallel `nproc`