Skip to content

Commit b5fd60f

Browse files
authored
Merge pull request #7 from 7bitcoder/dev
update main ci
2 parents e1e0224 + 3f715df commit b5fd60f

File tree

3 files changed

+10
-77
lines changed

3 files changed

+10
-77
lines changed

.github/workflows/MainCI.yml

Lines changed: 6 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ jobs:
2222
test-gcc:
2323
strategy:
2424
matrix:
25-
libraryType: [HeaderOnly, Static, Shared]
26-
version: [7, 10, 12]
27-
os: [ubuntu-22.04]
25+
libraryType: [Static]
26+
version: [7, 8, 10, 11]
27+
os: [ubuntu-20.04]
2828

2929
runs-on: ${{ matrix.os }}
3030

@@ -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: [HeaderOnly, Static]
58-
version: [7, 10, 12]
59-
os: [windows-2022]
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:
89-
libraryType: [HeaderOnly, Static]
90-
version: [6, 10, 15]
91-
os: [windows-2022, ubuntu-22.04]
57+
libraryType: [Static]
58+
version: [6, 13, 14, 15]
59+
os: [ubuntu-20.04]
9260

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

@@ -114,37 +82,3 @@ jobs:
11482
- name: Test
11583
working-directory: ${{ env.BUILD_DIR }}
11684
run: ctest -C ${{env.BUILD_TYPE}}
117-
118-
test-msvc:
119-
strategy:
120-
fail-fast: false
121-
matrix:
122-
libraryType: [HeaderOnly, Static]
123-
version: [14, 15, 17]
124-
os: [windows-2022]
125-
126-
runs-on: ${{ matrix.os }}
127-
128-
steps:
129-
- uses: actions/checkout@v3
130-
131-
- name: Install MSVC
132-
uses: TheMrMilchmann/setup-msvc-dev@v2.0.0
133-
with:
134-
toolset: ${{ matrix.version }}
135-
arch: x64
136-
137-
- name: Install Conan Packages
138-
uses: ./.github/actions/conan-install
139-
with:
140-
install-dir: ${{ env.BUILD_DIR }}
141-
142-
- name: CMake Build
143-
uses: ./.github/actions/cmake-build
144-
with:
145-
build-dir: ${{ env.BUILD_DIR }}
146-
build-type: ${{ env.BUILD_TYPE }}
147-
148-
- name: Test
149-
working-directory: ${{ env.BUILD_DIR }}
150-
run: ctest -C ${{env.BUILD_TYPE}}

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!

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
[![DevCI](https://github.com/7bitcoder/7bitinjector/actions/workflows/DevCI.yml/badge.svg?branch=dev)](https://github.com/7bitcoder/7bitinjector/actions/workflows/DevCI.ym)
2-
3-
[![MainCI](https://github.com/7bitcoder/7bitinjector/actions/workflows/MainCI.yml/badge.svg?branch=main)](https://github.com/7bitcoder/7bitinjector/actions/workflows/MainCI.ym)
1+
[![DevCI](https://github.com/7bitcoder/7bitinjector/actions/workflows/DevCI.yml/badge.svg?branch=dev)](https://github.com/7bitcoder/7bitinjector/actions/workflows/DevCI.yml)
2+
[![MainCI](https://github.com/7bitcoder/7bitinjector/actions/workflows/MainCI.yml/badge.svg?branch=main)](https://github.com/7bitcoder/7bitinjector/actions/workflows/MainCI.yml)
43
<div align="center">
54

65
<img src="Docs/_static/logo.svg" alt="logo" width="500" height="auto" />

0 commit comments

Comments
 (0)