Skip to content

Commit 314977c

Browse files
committed
simplify github workflows
1 parent ed7a77d commit 314977c

File tree

4 files changed

+17
-13
lines changed

4 files changed

+17
-13
lines changed

.github/workflows/macos.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: macos CI
1+
name: macOS
22

33
on:
44
pull_request:
@@ -22,12 +22,18 @@ concurrency:
2222

2323
jobs:
2424
ubuntu-build:
25-
runs-on: macos-latest
25+
strategy:
26+
fail-fast: false
27+
matrix:
28+
runs-on: [macos-14, macos-15]
29+
runs-on: ${{matrix.runs-on}}
2630
steps:
2731
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
2832
- name: Prepare
2933
run: cmake -B build
3034
- name: Build
31-
run: cmake --build build -j=2
35+
# m1 machines have 3 CPU
36+
# Ref: https://docs.github.com/en/actions/using-github-hosted-runners/using-github-hosted-runners/about-github-hosted-runners
37+
run: cmake --build build -j=3
3238
- name: Test
3339
run: ctest --output-on-failure --test-dir build

.github/workflows/ubuntu.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Ubuntu 24.04 CI
1+
name: Ubuntu
22

33
on:
44
pull_request:
@@ -21,12 +21,13 @@ concurrency:
2121
cancel-in-progress: true
2222

2323
jobs:
24-
ubuntu-build:
25-
runs-on: ubuntu-24.04
24+
build:
2625
strategy:
2726
matrix:
27+
runs-on: [ubuntu-24.04]
2828
shared: [ON, OFF]
2929
cxx: [g++-14]
30+
runs-on: ${{matrix.runs-on}}
3031
steps:
3132
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
3233
- name: Setup Ninja
@@ -36,6 +37,6 @@ jobs:
3637
env:
3738
CXX: ${{matrix.cxx}}
3839
- name: Build
39-
run: cmake --build build -j=2
40+
run: cmake --build build -j=4
4041
- name: Test
4142
run: ctest --output-on-failure --test-dir build

.github/workflows/visual-studio.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: VS17 CI
1+
name: Windows
22

33
on:
44
pull_request:
@@ -21,9 +21,8 @@ concurrency:
2121
cancel-in-progress: true
2222

2323
jobs:
24-
ci:
25-
name: windows-vs17
26-
runs-on: windows-latest
24+
build:
25+
runs-on: windows-2025
2726
strategy:
2827
fail-fast: false
2928
matrix:

src/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
add_library(ncrypto ncrypto.cpp engine.cpp)
2-
add_dependencies(ncrypto crypto ssl)
32
target_link_libraries(ncrypto PUBLIC ssl crypto)
43
target_include_directories(ncrypto
54
PUBLIC
65
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
76
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
87
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}>
9-
$<BUILD_INTERFACE:${boringssl_SOURCE_DIR}/include>
108
)

0 commit comments

Comments
 (0)