Skip to content

Commit ba48778

Browse files
committed
fix
1 parent 4c616b9 commit ba48778

File tree

2 files changed

+26
-11
lines changed

2 files changed

+26
-11
lines changed

.github/workflows/ci.yml

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,14 @@ jobs:
6161
- name: Setup Ice Build Dependencies
6262
uses: ./ice/.github/actions/setup-dependencies
6363

64-
- name: Build Ice on ${{ matrix.os }}
64+
- name: Build Ice
6565
uses: ./ice/.github/actions/build
6666
timeout-minutes: 60
6767
with:
6868
working_directory: ice
6969
build_flags: ${{ runner.os == 'Windows' && '/t:BuildDist' || 'srcs' }}
7070

71-
- name: Publish C# NuGet Packages on ${{ matrix.os }}
71+
- name: Publish C# NuGet Packages
7272
timeout-minutes: 5
7373
working-directory: ice/csharp/msbuild
7474
run: dotnet msbuild ice.proj /t:Publish
@@ -78,14 +78,27 @@ jobs:
7878
with:
7979
path: ice-demos
8080

81-
- name: Generate C++ Demos ${{ matrix.os }}
81+
- name: Generate C++ Demos
8282
timeout-minutes: 5
8383
working-directory: ice-demos/cpp
8484
run: |
85-
find . -name CMakeLists.txt type -f | while IFS= read -r file; dir="$(basename $file)"; do
86-
cmake -B "$dir/build" -S "$dir" -DIce_DEBUG=ON
87-
cmake --build "$dir/build" --config Release
88-
done
85+
find . -name CMakeLists.txt type -f | while IFS= read -r file; do
86+
dir="$(dirname $file)";
87+
cmake -B "$dir/build" -S "$dir" -DIce_DEBUG=ON
88+
cmake --build "$dir/build" --config Release
89+
done
90+
if: runner.os != 'Windows'
91+
92+
- name: Generate C++ Demos
93+
timeout-minutes: 5
94+
working-directory: ice-demos/cpp
95+
run: |
96+
Get-ChildItem -Recurse -Filter CMakeLists.txt | ForEach-Object {
97+
$dir = $_.DirectoryName
98+
cmake -B "$dir/build" -S "$dir" -DIce_DEBUG=ON
99+
cmake --build "$dir/build" --config Release
100+
}
101+
if: runner.os == 'Windows'
89102

90103
- name: Build C# Demos on ${{ matrix.os }}
91104
timeout-minutes: 20
@@ -120,7 +133,7 @@ jobs:
120133
timeout-minutes: 20
121134
working-directory: ice-demos/swift
122135
run: |
123-
find . -name Package.swift type -f | while IFS= read -r file; dir="$(basename $file)"; do
124-
swift build --package-path "$dir"
136+
find . -name Package.swift type -f | while IFS= read -r file; do
137+
swift build --package-path "$(dirname $file)"
125138
done
126139
if: runner.os == 'macOS'

.github/workflows/cpp.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,16 @@ jobs:
7272
timeout-minutes: 30
7373
working-directory: ice-demos/cpp
7474
run: |
75-
find . -name CMakeLists.txt type -f | while IFS= read -r file; dir="$(basename $file)"; do
75+
find . -name CMakeLists.txt type -f | while IFS= read -r file; do
76+
dir="$(dirname $file)";
7677
cmake -B "$dir/build" -S "$dir" -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DIce_DEBUG=ON
7778
cmake --build "$dir/build" --config Release
7879
done
7980
8081
- name: Run Clang Tidy
8182
working-directory: ice-demos/cpp
8283
run: |
83-
find . -name compile_commands.json type -f | while IFS= read -r file; dir="$(basename $file)"; do
84+
find . -name compile_commands.json type -f | while IFS= read -r file; do
85+
dir="$(dirname $file)";
8486
run-clang-tidy-19 -p $(dir) -j$(nproc) -quiet
8587
done

0 commit comments

Comments
 (0)