Skip to content

Commit e765f90

Browse files
[circleci] Update linux and mac jobs
Signed-off-by: Michal Princ <michal.princ@nxp.com>
1 parent e8d5684 commit e765f90

File tree

3 files changed

+26
-10
lines changed

3 files changed

+26
-10
lines changed

.circleci/config.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ commands:
2222
jobs:
2323
build-linux-gcc:
2424
machine:
25-
image: ubuntu-2204:2022.04.2 #https://circleci.com/developer/machine/image/ubuntu-2204 pick LTS
25+
image: ubuntu-2204:2024.04.4 #https://circleci.com/developer/machine/image/ubuntu-2204 pick LTS
2626
steps:
2727
- checkout
2828
- install_dependencies
@@ -32,7 +32,7 @@ jobs:
3232

3333
build-linux-clang:
3434
machine:
35-
image: ubuntu-2204:2022.04.2 #https://circleci.com/developer/machine/image/ubuntu-2204 pick LTS
35+
image: ubuntu-2204:2024.04.4 #https://circleci.com/developer/machine/image/ubuntu-2204 pick LTS
3636
steps:
3737
- checkout
3838
- install_dependencies:
@@ -44,8 +44,8 @@ jobs:
4444

4545
build-mac-gcc:
4646
macos:
47-
xcode: 12.5.1 # https://circleci.com/docs/using-macos/#supported-xcode-versions https://en.wikipedia.org/wiki/MacOS_version_history#Releases
48-
resource_class: macos.x86.medium.gen2
47+
xcode: 16.4.0 # https://circleci.com/docs/using-macos/#supported-xcode-versions https://en.wikipedia.org/wiki/MacOS_version_history#Releases
48+
resource_class: macos.m1.medium.gen1
4949
steps:
5050
- checkout
5151
- install_dependencies
@@ -55,8 +55,8 @@ jobs:
5555

5656
build-mac-clang:
5757
macos:
58-
xcode: 12.5.1 # https://circleci.com/docs/using-macos/#supported-xcode-versions https://en.wikipedia.org/wiki/MacOS_version_history#Releases
59-
resource_class: macos.x86.medium.gen2
58+
xcode: 16.4.0 # https://circleci.com/docs/using-macos/#supported-xcode-versions https://en.wikipedia.org/wiki/MacOS_version_history#Releases
59+
resource_class: macos.m1.medium.gen1
6060
steps:
6161
- checkout
6262
- install_dependencies:
@@ -73,10 +73,10 @@ jobs:
7373
steps:
7474
- checkout
7575
- run: powershell.exe .\install_dependencies.ps1
76-
- run: .\mingw64\bin\mingw32-make all
77-
- run: .\mingw64\opt\bin\python3.exe .\test\run_unit_tests.py -m"..\\..\\mingw64\\bin\\mingw32-make"
78-
# - store_artifacts:
79-
# path: ./Release/MINGW64/erpcgen/erpcgen.exe
76+
- run: C:\Users\circleci\project\cmake_installation\bin\cmake.exe --preset mingw64 -B ./build
77+
- run: C:\Users\circleci\project\cmake_installation\bin\cmake.exe --build ./build --target erpcgen
78+
- store_artifacts:
79+
path: ./build/erpcgen/erpcgen.exe
8080

8181
build-windows-VS:
8282
executor:

install_dependencies.ps1

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,18 @@ else
4949
Invoke-WebRequest -URI $URLMingw -OutFile $PathMingw7Zip
5050
& $Path7zipApp $UnzipMingw
5151
Remove-Item -ErrorAction Ignore $PathMingw7Zip
52+
53+
$URLCMake = "https://github.com/Kitware/CMake/releases/download/v4.0.3/cmake-4.0.3-windows-x86_64.zip"
54+
$PathCMakeZip = "cmake.zip"
55+
$PathCMake = "cmake_installation"
56+
Remove-Item -ErrorAction Ignore $PathCMakeZip
57+
Remove-Item -ErrorAction Ignore -Recurse $PathCMake
58+
Invoke-WebRequest -URI $URLCMake -OutFile $PathCMakeZip
59+
Expand-Archive -Path $PathCMakeZip -DestinationPath "."
60+
# Rename the extracted folder to 'cmake'
61+
$ExtractedFolder = Get-ChildItem -Directory -Name "cmake-*" | Select-Object -First 1
62+
if ($ExtractedFolder) {
63+
Rename-Item -Path $ExtractedFolder -NewName $PathCMake
64+
}
65+
Remove-Item -ErrorAction Ignore $PathCMakeZip
5266
}

scripts/kconfig/kconfig.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,7 @@ def write_kconfig_filenames(kconf, kconfig_list_path):
249249
with open(kconfig_list_path, 'w') as out:
250250
for path in sorted({os.path.realpath(os.path.join(kconf.srctree, path))
251251
for path in kconf.kconfig_filenames}):
252+
path = path.replace('\\', '/')
252253
print(path, file=out)
253254

254255
def write_header(kconf, kconfig_header_path):
@@ -260,6 +261,7 @@ def write_header(kconf, kconfig_header_path):
260261
with open(kconfig_header_path, 'w') as out:
261262
for path in sorted({os.path.realpath(os.path.join(kconf.srctree, path))
262263
for path in kconf.generated_headers}):
264+
path = path.replace('\\', '/')
263265
print(path, file=out)
264266

265267

0 commit comments

Comments
 (0)