From 69300e8d7c1947235888be2b8b3f4b0e2590b29e Mon Sep 17 00:00:00 2001
From: Mateusz Daniluk <121170681+VeithMetro@users.noreply.github.com>
Date: Mon, 14 Oct 2024 10:39:49 +0200
Subject: [PATCH 1/4] Update GCC multilib version and use venv for jsonref

---
 .github/workflows/Linux build template.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/Linux build template.yml b/.github/workflows/Linux build template.yml
index 899fac6..7415782 100644
--- a/.github/workflows/Linux build template.yml	
+++ b/.github/workflows/Linux build template.yml	
@@ -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:
 # ----- Building & uploading -----
     - name: Build ThunderLibraries
       run: |
+        source venv/bin/activate
         cmake -G Ninja -S ThunderLibraries -B ${{matrix.build_type}}/build/ThunderLibraries \
         -DCMAKE_CXX_FLAGS="-Wall -Wextra -Wpedantic -Werror -m${{matrix.architecture}}" \
         -DCMAKE_C_FLAGS="-Wall -Wextra -Wpedantic -Werror -m${{matrix.architecture}}" \

From 36fdb7640e19ce737d0381d7f2a4db46b78a7014 Mon Sep 17 00:00:00 2001
From: Mateusz Daniluk <121170681+VeithMetro@users.noreply.github.com>
Date: Mon, 14 Oct 2024 12:16:23 +0200
Subject: [PATCH 2/4] Use the develop branch for testing for now

---
 .github/workflows/Build ThunderLibraries on Linux.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/Build ThunderLibraries on Linux.yml b/.github/workflows/Build ThunderLibraries on Linux.yml
index bf69c3b..5d3ed52 100644
--- a/.github/workflows/Build ThunderLibraries on Linux.yml	
+++ b/.github/workflows/Build ThunderLibraries on Linux.yml	
@@ -9,7 +9,7 @@ on:
 
 jobs:
   Thunder:
-    uses: rdkcentral/Thunder/.github/workflows/Linux build template.yml@master
+    uses: rdkcentral/Thunder/.github/workflows/Linux build template.yml@development/actions-ubuntu-latest
 
   ThunderLibraries:
     needs: Thunder

From 6c876b9c8f5d3d40081aa3981d45b3c1796025e9 Mon Sep 17 00:00:00 2001
From: Mateusz Daniluk <121170681+VeithMetro@users.noreply.github.com>
Date: Mon, 14 Oct 2024 12:16:45 +0200
Subject: [PATCH 3/4] Explicitly state the ubuntu version

---
 .github/workflows/Linux build template.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/Linux build template.yml b/.github/workflows/Linux build template.yml
index 7415782..04846ff 100644
--- a/.github/workflows/Linux build template.yml	
+++ b/.github/workflows/Linux build template.yml	
@@ -6,7 +6,7 @@ on:
 jobs:
   ThunderLibraries:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     strategy:
       matrix:

From 696111f5258b346fe257b5761e3ab5a0c276c79f Mon Sep 17 00:00:00 2001
From: Mateusz Daniluk <121170681+VeithMetro@users.noreply.github.com>
Date: Mon, 14 Oct 2024 13:26:12 +0200
Subject: [PATCH 4/4] Use the master template as all changes were merged

---
 .github/workflows/Build ThunderLibraries on Linux.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/Build ThunderLibraries on Linux.yml b/.github/workflows/Build ThunderLibraries on Linux.yml
index 5d3ed52..bf69c3b 100644
--- a/.github/workflows/Build ThunderLibraries on Linux.yml	
+++ b/.github/workflows/Build ThunderLibraries on Linux.yml	
@@ -9,7 +9,7 @@ on:
 
 jobs:
   Thunder:
-    uses: rdkcentral/Thunder/.github/workflows/Linux build template.yml@development/actions-ubuntu-latest
+    uses: rdkcentral/Thunder/.github/workflows/Linux build template.yml@master
 
   ThunderLibraries:
     needs: Thunder