Skip to content

Commit a9f1d7d

Browse files
committed
Fix CI
1 parent bd9241e commit a9f1d7d

2 files changed

Lines changed: 2678 additions & 8 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ jobs:
2929
run: |
3030
sudo apt-get update
3131
sudo apt-get install -y build-essential cmake qtcreator qtbase5-dev libqt5serialport5 libqt5serialport5-dev
32-
echo "Listing Qt5 installation directories:"
33-
ls -R /usr/lib/x86_64-linux-gnu/qt5
34-
ls -R /usr/share/qt5
3532
3633
install-qt6:
3734
runs-on: ubuntu-latest
@@ -53,9 +50,6 @@ jobs:
5350
run: |
5451
sudo apt-get update
5552
sudo apt-get install -y build-essential cmake qtcreator qt6-base-dev qt6-declarative-dev qt6-serialport-dev
56-
echo "Listing Qt6 installation directories:"
57-
ls -R /usr/lib/x86_64-linux-gnu/qt6
58-
ls -R /usr/share/qt6
5953
6054
build-qt5:
6155
runs-on: ubuntu-latest
@@ -73,7 +67,7 @@ jobs:
7367
key: ${{ runner.os }}-qt5-deps-${{ hashFiles('CMakeLists.txt') }}
7468

7569
- name: Set CMAKE_PREFIX_PATH for Qt5
76-
run: echo "CMAKE_PREFIX_PATH=/usr/lib/x86_64-linux-gnu/qt5" >> $GITHUB_ENV
70+
run: echo "CMAKE_PREFIX_PATH=/usr/lib/x86_64-linux-gnu/cmake/Qt5" >> $GITHUB_ENV
7771

7872
- name: Configure CMake for Qt5
7973
run: cmake -B build_qt5 -DQT_VERSION=5
@@ -154,7 +148,7 @@ jobs:
154148
key: ${{ runner.os }}-qt6-deps-${{ hashFiles('CMakeLists.txt') }}
155149

156150
- name: Set CMAKE_PREFIX_PATH for Qt6
157-
run: echo "CMAKE_PREFIX_PATH=/usr/lib/x86_64-linux-gnu/qt6" >> $GITHUB_ENV
151+
run: echo "CMAKE_PREFIX_PATH=/usr/lib/x86_64-linux-gnu/cmake/Qt6" >> $GITHUB_ENV
158152

159153
- name: Configure CMake for Qt6
160154
run: cmake -B build_qt6 -DQT_VERSION=6

0 commit comments

Comments
 (0)