Skip to content

Commit 42c252c

Browse files
authored
Merge pull request #421 from chewing/refactor/symbol-versioning
build: simplify CMakeLists.txt
2 parents 5f32c5b + 194acfb commit 42c252c

16 files changed

+602
-757
lines changed

.github/workflows/ci.yml

+20-2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ on:
1111
env:
1212
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
1313
BUILD_TYPE: Release
14+
CMAKE_GENERATOR: Ninja
1415

1516
jobs:
1617
build:
@@ -19,7 +20,11 @@ jobs:
1920
matrix:
2021
os: [ubuntu-latest, windows-latest, macos-latest]
2122
with_rust: ['true', 'false']
22-
rust_version: ['1.70', 'stable']
23+
rust_version: ['1.70']
24+
include:
25+
- os: ubuntu-latest
26+
with_rust: true
27+
rust_version: stable
2328
exclude:
2429
- with_rust: 'false'
2530
rust_version: 'stable'
@@ -31,6 +36,15 @@ jobs:
3136
with:
3237
submodules: 'true'
3338

39+
- if: ${{ matrix.os == 'ubuntu-latest' }}
40+
run: sudo apt-get install ninja-build
41+
- if: ${{ matrix.os == 'macos-latest' }}
42+
run: brew install ninja
43+
- if: ${{ matrix.os == 'windows-latest' }}
44+
run: choco install ninja
45+
- if: ${{ matrix.os == 'windows-latest' }}
46+
uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756
47+
3448
- name: Setup rustup
3549
run: |
3650
rustup default ${{ matrix.rust_version }}
@@ -50,6 +64,8 @@ jobs:
5064
with:
5165
submodules: 'true'
5266

67+
- run: sudo apt-get install ninja-build
68+
5369
- name: Build
5470
run: cargo xtask build --build-type ${{env.BUILD_TYPE}} --with-rust false --with-hash true --verbose true
5571

@@ -61,13 +77,15 @@ jobs:
6177
matrix:
6278
with_rust: ['true', 'false']
6379
runs-on: ubuntu-latest
64-
name: with_rust=${{ matrix.with_rust }}
80+
name: Coverage with_rust=${{ matrix.with_rust }}
6581

6682
steps:
6783
- uses: actions/checkout@v3
6884
with:
6985
submodules: 'true'
7086

87+
- run: sudo apt-get install ninja-build
88+
7189
- name: Setup rustup
7290
run: |
7391
rustup default stable

0 commit comments

Comments
 (0)