Skip to content

Commit 60072bb

Browse files
committed
CI: remove shared
1 parent d7fbcee commit 60072bb

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

.github/workflows/main.yml

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,13 @@ on: [push, pull_request, workflow_dispatch]
1010

1111
jobs:
1212
job:
13-
name: ${{ matrix.os }}-${{ matrix.compiler }}-${{ matrix.linkage }}-${{ matrix.config }}
13+
name: ${{ matrix.os }}-${{ matrix.compiler }}-${{ matrix.config }}
1414
runs-on: ${{ matrix.os }}
1515
strategy:
1616
fail-fast: false
1717
matrix:
1818
os: [ubuntu-latest, macos-latest, windows-latest]
1919
config: [dbg, rel]
20-
linkage: [static, shared]
2120
include:
2221
# - os: windows-latest
2322
# triplet: x64-windows
@@ -29,8 +28,6 @@ jobs:
2928
# triplet: x64-osx
3029
- os: windows-latest
3130
config: dbg
32-
linkage: shared
33-
add_shared_path: $env:PATH += ";" + (Get-Item .).FullName + "\builds\ninja-cl-shared\src\Debug"
3431
- os: windows-latest
3532
config: rel
3633
add_shared_path: $env:PATH += ";" + (Get-Item .).FullName + "\builds\ninja-cl-shared\src\Release"
@@ -122,14 +119,12 @@ jobs:
122119
- name: Restore from cache the dependencies and generate project files
123120
run: |
124121
${{ matrix.pre_configure }}
125-
cmake --preset ninja-${{ matrix.compiler }}-${{ matrix.linkage }} -DCMAKE_CXX_COMPILER=${{ matrix.compiler }}
122+
cmake --preset ninja-${{ matrix.compiler }} -DCMAKE_CXX_COMPILER=${{ matrix.compiler }}
126123
127124
- name: Build
128125
run: |
129-
${{ matrix.add_shared_path }}
130-
cmake --build --preset build-ninja-${{ matrix.compiler }}-${{ matrix.linkage}}-${{ matrix.config }}
126+
cmake --build --preset build-ninja-${{ matrix.compiler }}-${{ matrix.config }}
131127
132128
- name: Test
133129
run: |
134-
${{ matrix.add_shared_path }}
135-
ctest --preset test-ninja-${{ matrix.compiler }}-${{ matrix.linkage}}-${{ matrix.config }} --output-on-failure
130+
ctest --preset test-ninja-${{ matrix.compiler }}-${{ matrix.config }} --output-on-failure

0 commit comments

Comments
 (0)