Skip to content

Commit 5cbb1e8

Browse files
committed
try fix rust, c, dotnet, go
1 parent 38b73b8 commit 5cbb1e8

File tree

7 files changed

+29
-11
lines changed

7 files changed

+29
-11
lines changed

.github/workflows/dotnet-demos.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@ jobs:
4242
with:
4343
dotnet-version: 6.0.x
4444

45-
- name: Package restore
46-
run: dotnet restore
47-
4845
# ************** REMOVE AFTER RELEASE ********************
4946
- name: Pack .NET SDK
5047
run: dotnet pack -c Release
@@ -54,6 +51,9 @@ jobs:
5451
run: dotnet add package -s ../../../binding/dotnet/Rhino/bin/Release Rhino
5552
# ********************************************************
5653

54+
- name: Package restore
55+
run: dotnet restore
56+
5757
- name: Dotnet build micdemo
5858
run: dotnet build -c MicDemo.Release
5959

@@ -84,9 +84,6 @@ jobs:
8484
steps:
8585
- uses: actions/checkout@v3
8686

87-
- name: Package restore
88-
run: dotnet restore
89-
9087
# ************** REMOVE AFTER RELEASE ********************
9188
- name: Pack .NET SDK
9289
run: dotnet pack -c Release
@@ -96,6 +93,9 @@ jobs:
9693
run: dotnet add package -s ../../../binding/dotnet/Rhino/bin/Release Rhino
9794
# ********************************************************
9895

96+
- name: Package restore
97+
run: dotnet restore
98+
9999
- name: Dotnet build micdemo
100100
run: dotnet build -c MicDemo.Release
101101

.github/workflows/dotnet.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -49,21 +49,24 @@ jobs:
4949

5050
strategy:
5151
matrix:
52-
os: [ubuntu-latest, macos-13, windows-latest]
52+
os: [ubuntu-latest, macos-latest, windows-latest]
5353
dotnet-version: [2.1.x, 3.0.x, 3.1.x, 5.0.x, 6.0.x]
5454
include:
5555
- dotnet-version: 2.1.x
5656
binding-framework: netstandard2.0
5757
test-framework: netcoreapp2.1
58+
os: [ubuntu-latest, macos-13, windows-latest]
5859
- dotnet-version: 3.0.x
5960
binding-framework: netcoreapp3.0
6061
test-framework: netcoreapp3.0
6162
- dotnet-version: 3.1.x
6263
binding-framework: netcoreapp3.0
6364
test-framework: netcoreapp3.1
65+
os: [ubuntu-latest, macos-13, windows-latest]
6466
- dotnet-version: 5.0.x
6567
binding-framework: netcoreapp3.0
6668
test-framework: net5.0
69+
os: [ubuntu-latest, macos-13, windows-latest]
6770
- dotnet-version: 6.0.x
6871
binding-framework: net6.0
6972
test-framework: net6.0

.github/workflows/rust-codestyle.yml

+12
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,12 @@ jobs:
6969
toolchain: stable
7070
override: true
7171

72+
# ************** REMOVE AFTER RELEASE ********************
73+
- name: Build Rust SDK
74+
run: ./copy.sh
75+
working-directory: binding/rust
76+
# ********************************************************
77+
7278
- name: Run clippy
7379
run: cargo clippy -- -D warnings
7480
working-directory: demo/rust/filedemo
@@ -90,6 +96,12 @@ jobs:
9096
toolchain: stable
9197
override: true
9298

99+
# ************** REMOVE AFTER RELEASE ********************
100+
- name: Build Rust SDK
101+
run: ./copy.sh
102+
working-directory: binding/rust
103+
# ********************************************************
104+
93105
- name: Run clippy
94106
run: cargo clippy -- -D warnings
95107
working-directory: demo/rust/micdemo

binding/go/rhino_test.go

+3
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,9 @@ func TestMessageStack(t *testing.T) {
289289
t.Fatalf("length of error is full: '%d'", len(err.Error()))
290290
}
291291

292+
t.Logf("err: %v", err)
293+
t.Logf("err2: %v", err2)
294+
292295
if len(err2.Error()) != len(err.Error()) {
293296
t.Fatalf("length of 1st init '%d' does not match 2nd init '%d'", len(err.Error()), len(err2.Error()))
294297
}

demo/c/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ target_include_directories(rhino_demo_file PRIVATE dr_libs)
2424
if (NOT WIN32)
2525
target_link_libraries(rhino_demo_mic ${COMMON_LIBS} ${MIC_LIBS})
2626
target_link_libraries(rhino_demo_file ${COMMON_LIBS})
27-
if((${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm") AND (UNIX AND NOT APPLE))
27+
if((${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm" or ${CMAKE_SYSTEM_PROCESSOR} MATCHES "armv7l") AND (UNIX AND NOT APPLE))
2828
target_link_libraries(rhino_demo_mic atomic)
2929
endif()
30-
endif()
30+
endif()

demo/rust/filedemo/Cargo.lock

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo/rust/micdemo/Cargo.lock

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)