Skip to content

Commit 5611f4a

Browse files
committed
update CI
1 parent b44b438 commit 5611f4a

File tree

2 files changed

+8
-41
lines changed

2 files changed

+8
-41
lines changed

.github/workflows/MainCI.yml

Lines changed: 6 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
strategy:
2424
matrix:
2525
libraryType: [Static]
26-
version: [7, 10, 11]
26+
version: [7, 8, 10, 11]
2727
os: [ubuntu-20.04]
2828

2929
runs-on: ${{ matrix.os }}
@@ -51,44 +51,12 @@ jobs:
5151
working-directory: ${{ env.BUILD_DIR }}
5252
run: ctest -C ${{env.BUILD_TYPE}}
5353

54-
test-mingw:
55-
strategy:
56-
matrix:
57-
libraryType: [Static]
58-
version: [7, 10, 12]
59-
os: [windows-2019]
60-
61-
runs-on: ${{ matrix.os }}
62-
63-
steps:
64-
- uses: actions/checkout@v3
65-
66-
- name: Install MinGW
67-
uses: egor-tensin/setup-mingw@v2.2.0
68-
with:
69-
version: ${{ matrix.version }}
70-
71-
- name: Install Conan Packages
72-
uses: ./.github/actions/conan-install
73-
with:
74-
install-dir: ${{ env.BUILD_DIR }}
75-
76-
- name: CMake Build
77-
uses: ./.github/actions/cmake-build
78-
with:
79-
build-dir: ${{ env.BUILD_DIR }}
80-
build-type: ${{ env.BUILD_TYPE }}
81-
82-
- name: Test
83-
working-directory: ${{ env.BUILD_DIR }}
84-
run: ctest -C ${{env.BUILD_TYPE}}
85-
8654
test-clang:
8755
strategy:
8856
matrix:
8957
libraryType: [Static]
90-
version: [6.0, 10, 15]
91-
os: [windows-2022, ubuntu-20.04]
58+
version: [6, 13, 14, 15]
59+
os: [ubuntu-20.04]
9260

9361
runs-on: ${{ matrix.os }}
9462

@@ -120,19 +88,18 @@ jobs:
12088
fail-fast: false
12189
matrix:
12290
libraryType: [Static]
123-
version: [14.0, 15.0, 17.0]
91+
version: [14.0, 15.0, 16.0, 17.0]
12492
os: [windows-2022]
12593

12694
runs-on: ${{ matrix.os }}
12795

12896
steps:
12997
- uses: actions/checkout@v3
13098

131-
- name: Install MSVC
132-
uses: TheMrMilchmann/setup-msvc-dev@v2.0.0
99+
- name: Enable Developer Command Prompt
100+
uses: ilammy/msvc-dev-cmd@v1.12.1
133101
with:
134102
toolset: ${{ matrix.version }}
135-
arch: x64
136103

137104
- name: Install Conan Packages
138105
uses: ./.github/actions/conan-install

Docs/getting-started.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ Library is officially supported on the following platforms:
1616

1717
**Compilers:**
1818

19-
* gcc 5.0+
20-
* clang 5.0+
19+
* gcc 7.0+
20+
* clang 6.0+
2121
* MSVC 2015+
2222

2323
If you notice any problems/bugs, please file an issue on the 7bitInjector_ GitHub Issue Tracker. Pull requests containing fixes are welcome!

0 commit comments

Comments
 (0)