diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4257a80068..daa0073958 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,8 @@ jobs: strategy: fail-fast: true matrix: - qt-version: ["5.15.2", "5.12.8"] + runs-on: ["ubuntu-latest", "ubuntu-20.04"] + # qt-version: ["5.15.2", "5.12.8"] steps: - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 @@ -34,20 +35,35 @@ jobs: run: | cmake --version - - uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0 - with: - python-version: '3.9' +# - uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0 +# with: +# python-version: '3.9' - - name: Install Qt - uses: jurplel/install-qt-action@b3ea5275e37b734d027040e2c7fe7a10ea2ef946 # v3.3.0 - with: - version: "${{ matrix.qt-version }}" - arch: "gcc_64" +# - name: Install Qt +# uses: jurplel/install-qt-action@b3ea5275e37b734d027040e2c7fe7a10ea2ef946 # v3.3.0 +# with: +# version: "${{ matrix.qt-version }}" +# arch: "gcc_64" - name: Install DCMTK run: sudo apt-get install -y dcmtk + - name: Install Qt + run: | + sudo apt-get install -y \ + qt5-default \ + qtmultimedia5-dev \ + qttools5-dev \ + libqt5xmlpatterns5-dev \ + libqt5svg5-dev \ + qtwebengine5-dev \ + qtscript5-dev \ + qtbase5-private-dev \ + libqt5x11extras5-dev \ + libxt-dev + - name: Install VTK + if: matrix.runs-on == 'ubuntu-latest' run: | sudo apt-get install -y \ libvtk9-dev \ @@ -58,9 +74,9 @@ jobs: cmake \ -DCTK_QT_VERSION:STRING=5 \ -DCTK_ENABLE_Widgets:BOOL=ON \ - -DCTK_USE_SYSTEM_VTK:BOOL=ON \ - -DCTK_LIB_Visualization/VTK/Widgets:BOOL=ON \ - -DCTK_LIB_Visualization/VTK/Widgets_USE_TRANSFER_FUNCTION_CHARTS:BOOL=ON \ + -DCTK_USE_SYSTEM_VTK:BOOL=$CTK_USE_VTK \ + -DCTK_LIB_Visualization/VTK/Widgets:BOOL=$CTK_USE_VTK \ + -DCTK_LIB_Visualization/VTK/Widgets_USE_TRANSFER_FUNCTION_CHARTS:BOOL=$CTK_USE_VTK \ -DCTK_USE_SYSTEM_DCMTK:BOOL=ON \ -DCTK_APP_ctkDICOM:BOOL=ON \ -DCTK_LIB_DICOM/Core:BOOL=ON \ @@ -77,6 +93,9 @@ jobs: -DCTK_ENABLE_Python_Wrapping:BOOL=ON \ -B CTK-build \ -S . + env: + CTK_USE_VTK: "${{ matrix.runs-on == 'ubuntu-latest' && 'ON' || 'OFF' }}" + - name: Display Qt5_DIR run: |