Skip to content

Commit b630ffd

Browse files
ViralBShahclaude
andcommitted
Merge master into cmake; resolve ci.yml conflicts
- Keep CMAKE_GENERATOR env on windows job - Use matrix.os for windows runs-on (enables windows-11-arm) - Drop code-coverage-old (removed in master) - Retain CMake install + cmake/ctest steps from this branch Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2 parents 89b8a6e + 590f28d commit b630ffd

1 file changed

Lines changed: 8 additions & 22 deletions

File tree

.github/workflows/ci.yml

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ jobs:
2121
matrix:
2222
os:
2323
- ubuntu-latest
24+
- ubuntu-24.04-arm
2425
- macos-latest
26+
- macos-15-intel
2527
steps:
2628
- &git-checkout
2729
name: Checkout Openlibm
@@ -42,17 +44,18 @@ jobs:
4244
name: Test with CTest
4345
run: ctest --test-dir build --output-on-failure
4446
windows:
45-
runs-on: windows-latest
47+
runs-on: ${{ matrix.os }}
4648
env:
4749
CMAKE_GENERATOR: "MinGW Makefiles"
4850
strategy:
4951
fail-fast: false
5052
matrix:
5153
include:
52-
- { sys: mingw64, env: x86_64 }
53-
- { sys: mingw32, env: i686 }
54-
- { sys: ucrt64, env: ucrt-x86_64 } # Experimental!
55-
- { sys: clang64, env: clang-x86_64 } # Experimental!
54+
- { os: windows-latest, sys: mingw64, env: x86_64 }
55+
- { os: windows-latest, sys: mingw32, env: i686 }
56+
- { os: windows-latest, sys: ucrt64, env: ucrt-x86_64 } # Experimental!
57+
- { os: windows-latest, sys: clang64, env: clang-x86_64 } # Experimental!
58+
- { os: windows-11-arm, sys: clangarm64, env: clang-aarch64 } # Experimental!
5659
defaults:
5760
run:
5861
shell: msys2 {0}
@@ -68,23 +71,6 @@ jobs:
6871
- *make-test
6972
- *cmake-build
7073
- *ctest
71-
code-coverage-old:
72-
runs-on: ubuntu-latest
73-
steps:
74-
- *git-checkout
75-
- name: Setup LCOV
76-
uses: hrishikesh-kadam/setup-lcov@v1
77-
- name: Build and Run tests
78-
run: make coverage -j
79-
# - name: Upload coverage to Codecov
80-
# uses: codecov/codecov-action@v6
81-
# with:
82-
# files: ./cov-html/libopenlibm.info
83-
# token: ${{ secrets.CODECOV_TOKEN }}
84-
- uses: actions/upload-artifact@v7
85-
with:
86-
name: code-coverage-report-old
87-
path: ./cov-html/
8874
code-coverage:
8975
runs-on: ubuntu-latest
9076
steps:

0 commit comments

Comments
 (0)