From e9858b0666449130cd0e31b51f41cea520b34e02 Mon Sep 17 00:00:00 2001
From: Mateusz Daniluk <121170681+VeithMetro@users.noreply.github.com>
Date: Wed, 16 Oct 2024 11:17:54 +0200
Subject: [PATCH] [Actions] Update GCC, ubuntu version and use venv for jsonref
 (#322)

* Update gcc, ubuntu version and use venv

* Use develop branch for testing
---
 .../workflows/Build ThunderNanoServicesRDK on Linux.yml  | 2 +-
 .github/workflows/Linux build template.yml               | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/Build ThunderNanoServicesRDK on Linux.yml b/.github/workflows/Build ThunderNanoServicesRDK on Linux.yml
index 2a0051c..e6668cc 100644
--- a/.github/workflows/Build ThunderNanoServicesRDK on Linux.yml	
+++ b/.github/workflows/Build ThunderNanoServicesRDK on Linux.yml	
@@ -17,4 +17,4 @@ jobs:
 
   ThunderNanoServicesRDK:
     needs: ThunderInterfaces
-    uses: WebPlatformForEmbedded/ThunderNanoServicesRDK/.github/workflows/Linux build template.yml@master
+    uses: WebPlatformForEmbedded/ThunderNanoServicesRDK/.github/workflows/Linux build template.yml@development/actions-runners-update
diff --git a/.github/workflows/Linux build template.yml b/.github/workflows/Linux build template.yml
index 8d37cb6..0951801 100644
--- a/.github/workflows/Linux build template.yml	
+++ b/.github/workflows/Linux build template.yml	
@@ -6,7 +6,7 @@ on:
 jobs:
   ThunderNanoServicesRDK:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     strategy:
       matrix:
@@ -28,8 +28,10 @@ jobs:
           echo "deb http://archive.ubuntu.com/ubuntu/ jammy-updates main universe restricted multiverse" | sudo tee -a /etc/apt/sources.list
           sudo dpkg --add-architecture i386
           sudo apt-get update
-          sudo apt install python3-pip build-essential cmake ninja-build libusb-1.0-0-dev zlib1g-dev zlib1g-dev:i386 libssl-dev gcc-11-multilib g++-11-multilib
-          sudo pip install jsonref
+          sudo apt install python3-pip build-essential cmake ninja-build libusb-1.0-0-dev ${{matrix.architecture == '32' && 'zlib1g-dev:i386 libssl-dev:i386 gcc-13-multilib g++-13-multilib' || 'zlib1g-dev libssl-dev'}}
+          python3 -m venv venv
+          source venv/bin/activate
+          pip install jsonref
 
     - name: Download artifacts
       uses: actions/download-artifact@v4
@@ -61,6 +63,7 @@ jobs:
 # ----- Build & upload artifacts -----
     - name: Build ThunderNanoServicesRDK
       run: |
+        source venv/bin/activate
         cmake -G Ninja -S ThunderNanoServicesRDK -B ${{matrix.build_type}}/build/ThunderNanoServicesRDK \
         -DCMAKE_CXX_FLAGS="-Wall -Wextra -Wpedantic -Werror -m${{matrix.architecture}}" \
         -DCMAKE_C_FLAGS="-Wall -Wextra -Wpedantic -Werror -m${{matrix.architecture}}" \