[circleci] Update linux and mac jobs

Signed-off-by: Michal Princ <[email protected]>

Author: MichalPrincNXP

.circleci/config.yml

@@ -22,7 +22,7 @@ commands:
 jobs:
   build-linux-gcc:
     machine:
-      image: ubuntu-2204:2022.04.2 #https://circleci.com/developer/machine/image/ubuntu-2204 pick LTS
+      image: ubuntu-2204:2024.04.4 #https://circleci.com/developer/machine/image/ubuntu-2204 pick LTS
     steps:
       - checkout
       - install_dependencies
@@ -32,7 +32,7 @@ jobs:
 
   build-linux-clang:
     machine:
-      image: ubuntu-2204:2022.04.2 #https://circleci.com/developer/machine/image/ubuntu-2204 pick LTS
+      image: ubuntu-2204:2024.04.4 #https://circleci.com/developer/machine/image/ubuntu-2204 pick LTS
     steps:
       - checkout
       - install_dependencies:
@@ -44,8 +44,8 @@ jobs:
 
   build-mac-gcc:
     macos:
-      xcode: 12.5.1 # https://circleci.com/docs/using-macos/#supported-xcode-versions https://en.wikipedia.org/wiki/MacOS_version_history#Releases
-    resource_class: macos.x86.medium.gen2
+      xcode: 16.4.0 # https://circleci.com/docs/using-macos/#supported-xcode-versions https://en.wikipedia.org/wiki/MacOS_version_history#Releases
+    resource_class: macos.m1.medium.gen1
     steps:
       - checkout
       - install_dependencies
@@ -55,8 +55,8 @@ jobs:
 
   build-mac-clang:
     macos:
-      xcode: 12.5.1 # https://circleci.com/docs/using-macos/#supported-xcode-versions https://en.wikipedia.org/wiki/MacOS_version_history#Releases
-    resource_class: macos.x86.medium.gen2
+      xcode: 16.4.0 # https://circleci.com/docs/using-macos/#supported-xcode-versions https://en.wikipedia.org/wiki/MacOS_version_history#Releases
+    resource_class: macos.m1.medium.gen1
     steps:
       - checkout
       - install_dependencies:
@@ -73,8 +73,12 @@ jobs:
     steps:
       - checkout
       - run: powershell.exe .\install_dependencies.ps1
-      - run: .\mingw64\bin\mingw32-make all
-      - run: .\mingw64\opt\bin\python3.exe .\test\run_unit_tests.py -m"..\\..\\mingw64\\bin\\mingw32-make"
+      - run: $env:PATH = "C:\Users\circleci\project\cmake_installation\bin;$env:PATH"
+      - run: ls
+      - run: pwd
+      - run: C:\Users\circleci\project\cmake_installation\bin\cmake.exe --preset mingw64 -B ./build
+      - run: C:\Users\circleci\project\cmake_installation\bin\cmake.exe --build ./build --target erpcgen
+      #- run: .\mingw64\opt\bin\python3.exe .\test\run_unit_tests.py --generate-shim --erpcgen build/erpcgen/erpcgen
       # - store_artifacts:
       #     path: ./Release/MINGW64/erpcgen/erpcgen.exe
 

install_dependencies.ps1

@@ -49,4 +49,71 @@ else
     Invoke-WebRequest -URI $URLMingw -OutFile $PathMingw7Zip
     & $Path7zipApp $UnzipMingw
     Remove-Item -ErrorAction Ignore $PathMingw7Zip
+
+    $URLCMake = "https://github.com/Kitware/CMake/releases/download/v4.0.3/cmake-4.0.3-windows-x86_64.zip"
+    $PathCMakeZip = "cmake.zip"
+    $PathCMake = "cmake_installation"
+    Remove-Item -ErrorAction Ignore $PathCMakeZip
+    Remove-Item -ErrorAction Ignore -Recurse $PathCMake
+    Invoke-WebRequest -URI $URLCMake -OutFile $PathCMakeZip
+    Expand-Archive -Path $PathCMakeZip -DestinationPath "."
+    # Rename the extracted folder to 'cmake'
+    $ExtractedFolder = Get-ChildItem -Directory -Name "cmake-*" | Select-Object -First 1
+    if ($ExtractedFolder) {
+        Rename-Item -Path $ExtractedFolder -NewName $PathCMake
+    }
+    Remove-Item -ErrorAction Ignore $PathCMakeZip
+
+    # Get the absolute path to CMake
+    $CMakeBinPath = Join-Path (Get-Location) "cmake_installation\bin"
+    $CMakeExe = Join-Path $CMakeBinPath "cmake.exe"
+
+    # Get the absolute path to CMake
+    $CMakeBinPath = Join-Path (Get-Location) "cmake_installation\bin"
+    $CMakeExe = Join-Path $CMakeBinPath "cmake.exe"
+
+    Write-Host "CMake and MinGW installed"
+    Write-Host "CMake path: $CMakeBinPath"
+    $MingwBinPath = Join-Path (Get-Location) "mingw64\bin"
+    Write-Host "MinGW path: $MingwBinPath"
+}
+
+# Verify CMake installation using full path
+if (Test-Path $CMakeExe) {
+    Write-Host "CMake installation verified successfully"
+    Write-Host "CMake executable location: $CMakeExe"
+    try {
+        & $CMakeExe --version
+        Write-Host ""
+        Write-Host "To use CMake in your current session, add it to PATH with:"
+        Write-Host "`$env:PATH = `"$CMakeBinPath;`$env:PATH`""
+        Write-Host ""
+        Write-Host "Or use the full path: $CMakeExe"
+    }
+    catch {
+        Write-Warning "CMake executable found but failed to run: $_"
+    }
+} else {
+    Write-Warning "CMake installation failed - executable not found at $CMakeExe"
+    Write-Host "Checking what was extracted..."
+    if (Test-Path $PathCMake) {
+        Get-ChildItem -Path $PathCMake -Recurse -Name "cmake.exe"
+    }
 }
+
+# Optionally, update PATH for current session
+Write-Host ""
+Write-Host "Updating PATH for current PowerShell session..."
+$env:PATH = "$CMakeBinPath;$env:PATH"
+$env:PATH = "C:\Users\circleci\project\cmake_installation\bin;$env:PATH"
+Write-Host "CMake should now be available as 'cmake' command in this session"
+
+# Test if cmake is now available
+try {
+    cmake --version
+    Write-Host "SUCCESS: CMake is now available in PATH"
+}
+catch {
+    Write-Warning "CMake still not available in PATH. Use full path: $CMakeExe"
+}
+