From 146b1d04abfa02c39f34e860c3395f1409f067ea Mon Sep 17 00:00:00 2001 From: Ake Hedman Date: Thu, 14 Mar 2024 20:13:55 +0100 Subject: [PATCH] Updated workflows to use node v20 --- .github/workflows/appimage.yml | 8 ++++---- .github/workflows/ccpp.yml | 4 ++-- .github/workflows/cmake-mac.yml | 6 +++--- .github/workflows/cmake.yml | 8 ++++---- .github/workflows/googletest-checker.yml | 2 +- .github/workflows/make-appimage-qt6.yml | 6 +++--- .github/workflows/msbuild.yml | 6 +++--- CMakeLists.txt | 3 ++- 8 files changed, 22 insertions(+), 21 deletions(-) diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index 14860d24..b9651366 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -17,12 +17,12 @@ jobs: steps: # https://github.com/actions/checkout - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: recursive - name: Checkout vscp repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: grodansparadis/vscp path: vscp @@ -30,7 +30,7 @@ jobs: submodules: recursive - name: Checkout eclipse paho repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: eclipse/paho.mqtt.c path: paho @@ -64,7 +64,7 @@ jobs: run: sudo apt install qttools5-dev qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools qtdeclarative5-dev libqt5charts5-dev libqt5serialbus5-dev libqt5serialport5-dev - name: Setup cmake - uses: jwlawson/actions-setup-cmake@v1.14 + uses: jwlawson/actions-setup-cmake@v2.01 - name: Create Build Environment run: | diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 64bdd3bc..1c5fd052 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 # - name: Create build folder # run: cd src && mkdir build && cd build && cmake -DCMAKE_CXX_FLAGS="-Werror" .. # - name: build @@ -32,7 +32,7 @@ jobs: # os: [windows-latest, windows-2016] # steps: - # - uses: actions/checkout@v3 + # - uses: actions/checkout@v4 # - name: configure # run: cd src && mkdir build && cd build && cmake .. # - name: build diff --git a/.github/workflows/cmake-mac.yml b/.github/workflows/cmake-mac.yml index 744eceed..269eb796 100644 --- a/.github/workflows/cmake-mac.yml +++ b/.github/workflows/cmake-mac.yml @@ -15,7 +15,7 @@ jobs: runs-on: macos-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Add msbuild to PATH uses: microsoft/setup-msbuild@v1.0.2 @@ -23,14 +23,14 @@ jobs: vs-version: '[16.4,16.5)' - name: Checkout vscp repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: grodansparadis/vscp path: vscp ref: development - name: Checkout eclipse paho repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: eclipse/paho.mqtt.c path: paho diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 16bf6dd2..80ce9e37 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -16,12 +16,12 @@ jobs: steps: # https://github.com/actions/checkout - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: recursive - name: Checkout vscp repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: grodansparadis/vscp path: vscp @@ -29,7 +29,7 @@ jobs: submodules: recursive - name: Checkout eclipse paho repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: eclipse/paho.mqtt.c path: paho @@ -59,7 +59,7 @@ jobs: run: sudo apt install qttools5-dev qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools qtdeclarative5-dev libqt5charts5-dev libqt5serialbus5-dev libqt5serialport5-dev - name: Setup cmake - uses: jwlawson/actions-setup-cmake@v1.14 + uses: jwlawson/actions-setup-cmake@v2.01 - name: Create Build Environment run: | diff --git a/.github/workflows/googletest-checker.yml b/.github/workflows/googletest-checker.yml index 27bf1ef7..8032d93c 100644 --- a/.github/workflows/googletest-checker.yml +++ b/.github/workflows/googletest-checker.yml @@ -10,6 +10,6 @@ jobs: name: Test Project runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Test project with googletest. uses: arvsrao/googletest-action@master \ No newline at end of file diff --git a/.github/workflows/make-appimage-qt6.yml b/.github/workflows/make-appimage-qt6.yml index de2ca6b2..62b11fdf 100644 --- a/.github/workflows/make-appimage-qt6.yml +++ b/.github/workflows/make-appimage-qt6.yml @@ -22,12 +22,12 @@ jobs: steps: # https://github.com/actions/checkout - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: recursive - name: Checkout vscp repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: grodansparadis/vscp path: vscp @@ -36,7 +36,7 @@ jobs: - name: Checkout eclipse paho repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: eclipse/paho.mqtt.c path: paho diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index 17da1f3f..36a8e79d 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -52,12 +52,12 @@ jobs: extra: '--external 7z' - name: Clone - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: 'recursive' - name: Checkout vscp repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: grodansparadis/vscp path: ${{ github.workspace }} @@ -106,7 +106,7 @@ jobs: # key: ${{ runner.os }}-vcpkg # - name: Checkout vcpkg repo - # uses: actions/checkout@v3 + # uses: actions/checkout@v4 # with: # repository: microsoft/vcpkg # path: C:/vcpkg diff --git a/CMakeLists.txt b/CMakeLists.txt index 76caf436..d87f1ea9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -85,7 +85,8 @@ set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/modules) # qt #find_package(Qt5 COMPONENTS Widgets LinguistTools REQUIRED Core Network Quick Sql Qml SerialPort) -find_package(Qt5 COMPONENTS Widgets LinguistTools REQUIRED Core Network Sql Charts Quick SerialBus SerialPort) +#find_package(Qt5 5.15 COMPONENTS Widgets LinguistTools REQUIRED Core Network Sql Charts Quick SerialBus SerialPort QmlImportScanner) +find_package(Qt5 5.15 COMPONENTS Widgets LinguistTools REQUIRED Core Network Sql Charts Quick SerialBus SerialPort) # pthreads set (THREADS_PREFER_PTHREAD_FLAG ON)