Updated workflows to use node v20

grodansparadis · Mar 14, 2024 · 146b1d0 · 146b1d0
1 parent e4bf46a
commit 146b1d0
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 21 deletions.
diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml
@@ -17,20 +17,20 @@ 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
         ref: development  
         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
@@ -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
@@ -15,22 +15,22 @@ jobs:
     runs-on: macos-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Add msbuild to PATH
       uses: microsoft/[email protected]
       with:
         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
@@ -16,20 +16,20 @@ 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
         ref: development  
         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
@@ -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
diff --git 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
@@ -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
@@ -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)