GA: Remove Qt5 builds for AppFwkUnitTest jobs.

This commit is contained in:
Kristian Bendiksen 2024-10-04 13:35:40 +02:00
parent 3797aa8211
commit d01ef325fa

View File

@ -8,12 +8,10 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
os: [ubuntu-latest, windows-latest] os: [ubuntu-latest, windows-latest]
qtver: [5.12.12, 6.5.3] qtver: [6.5.3]
include: include:
- qtver: 6.5.3 - qtver: 6.5.3
build_flags: -DCEE_USE_QT6=ON -DCEE_USE_QT5=OFF build_flags: -DCEE_USE_QT6=ON -DCEE_USE_QT5=OFF
- qtver: 5.12.12
build_flags: -DCEE_USE_QT6=OFF -DCEE_USE_QT5=ON
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v4
@ -57,20 +55,6 @@ jobs:
cd cmakebuild cd cmakebuild
cmake --install . --prefix ${{github.workspace}}/cmakebuild/install cmake --install . --prefix ${{github.workspace}}/cmakebuild/install
- name: Run Unit Tests Qt5
if: matrix.qtver == '5.12.12'
shell: bash
run: |
cmakebuild/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/cafPdmCore_UnitTests
cmakebuild/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/cafPdmXml_UnitTests
cmakebuild/cafProjectDataModel/cafProjectDataModel_UnitTests/cafProjectDataModel_UnitTests
cmakebuild/cafPdmScripting/cafPdmScripting_UnitTests/cafPdmScripting_UnitTests
- name: Run Unit Tests Windows Qt5 (does not work on Linux)
if: (contains( matrix.os, 'windows') && (matrix.qtver == '5.12.12'))
shell: bash
run: cmakebuild/cafUserInterface/cafUserInterface_UnitTests/cafUserInterface_UnitTests
- name: Run Unit Tests Qt6 - name: Run Unit Tests Qt6
if: matrix.qtver == '6.5.3' if: matrix.qtver == '6.5.3'
shell: bash shell: bash
@ -84,4 +68,3 @@ jobs:
if: (contains( matrix.os, 'windows') && (matrix.qtver == '6.5.3')) if: (contains( matrix.os, 'windows') && (matrix.qtver == '6.5.3'))
shell: bash shell: bash
run: cmakebuild/install/bin/cafUserInterface_UnitTests run: cmakebuild/install/bin/cafUserInterface_UnitTests