Skip to content

Commit 76fa28b

Browse files
authored
Merge branch 'EmbeddedRPC:main' into arbitrator-timeout
2 parents 0136fa0 + 9749163 commit 76fa28b

File tree

328 files changed

+32876
-4110
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

328 files changed

+32876
-4110
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:

.github/workflows/clang-format.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,12 @@ jobs:
1111
- uses: DoozyX/clang-format-lint-action@v0.16.2
1212
with:
1313
source: '.'
14-
exclude: './examples/zephyr/matrix_multiply_rpmsglite/remote/src/service ./examples/zephyr/matrix_multiply_rpmsglite/src/service ./examples/zephyr/matrix_multiply_uart/src/service'
14+
exclude: './examples/zephyr/matrix_multiply_mbox/remote/src/service
15+
./examples/zephyr/matrix_multiply_mbox/src/service
16+
./examples/zephyr/matrix_multiply_rpmsglite/remote/src/service
17+
./examples/zephyr/matrix_multiply_rpmsglite/src/service
18+
./examples/zephyr/matrix_multiply_tcp/src/service
19+
./examples/zephyr/matrix_multiply_uart/src/service
20+
./examples/MCUXPRESSO_SDK/erpc_matrix_multiply/service
21+
./examples/MCUXPRESSO_SDK/erpc_two_way_rpc/service'
1522
clangFormatVersion: 16

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ kds
100100
iar
101101
mdk
102102
lpcx
103-
mcux
104103
tags
105104

106105
format-files-to-commit.rb

0 commit comments

Comments
 (0)