Skip to content

update main ci #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
7bitcoder merged 5 commits into from
May 13, 2023
Merged

update main ci #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b44b438
update ci
7bitcoder May 12, 2023
5611f4a
update CI
7bitcoder May 13, 2023
5d9168c
fix vsversion in CI
7bitcoder May 13, 2023
c2748d2
fix vsversion in CI
7bitcoder May 13, 2023
3f715df
rem msvc
7bitcoder May 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 6 additions & 72 deletions .github/workflows/MainCI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ jobs:
test-gcc:
strategy:
matrix:
libraryType: [HeaderOnly, Static, Shared]
version: [7, 10, 12]
os: [ubuntu-22.04]
libraryType: [Static]
version: [7, 8, 10, 11]
os: [ubuntu-20.04]

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

Expand All @@ -51,44 +51,12 @@ jobs:
working-directory: ${{ env.BUILD_DIR }}
run: ctest -C ${{env.BUILD_TYPE}}

test-mingw:
strategy:
matrix:
libraryType: [HeaderOnly, Static]
version: [7, 10, 12]
os: [windows-2022]

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

steps:
- uses: actions/checkout@v3

- name: Install MinGW
uses: egor-tensin/setup-mingw@v2.2.0
with:
version: ${{ matrix.version }}

- name: Install Conan Packages
uses: ./.github/actions/conan-install
with:
install-dir: ${{ env.BUILD_DIR }}

- name: CMake Build
uses: ./.github/actions/cmake-build
with:
build-dir: ${{ env.BUILD_DIR }}
build-type: ${{ env.BUILD_TYPE }}

- name: Test
working-directory: ${{ env.BUILD_DIR }}
run: ctest -C ${{env.BUILD_TYPE}}

test-clang:
strategy:
matrix:
libraryType: [HeaderOnly, Static]
version: [6, 10, 15]
os: [windows-2022, ubuntu-22.04]
libraryType: [Static]
version: [6, 13, 14, 15]
os: [ubuntu-20.04]

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

Expand All @@ -114,37 +82,3 @@ jobs:
- name: Test
working-directory: ${{ env.BUILD_DIR }}
run: ctest -C ${{env.BUILD_TYPE}}

test-msvc:
strategy:
fail-fast: false
matrix:
libraryType: [HeaderOnly, Static]
version: [14, 15, 17]
os: [windows-2022]

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

steps:
- uses: actions/checkout@v3

- name: Install MSVC
uses: TheMrMilchmann/setup-msvc-dev@v2.0.0
with:
toolset: ${{ matrix.version }}
arch: x64

- name: Install Conan Packages
uses: ./.github/actions/conan-install
with:
install-dir: ${{ env.BUILD_DIR }}

- name: CMake Build
uses: ./.github/actions/cmake-build
with:
build-dir: ${{ env.BUILD_DIR }}
build-type: ${{ env.BUILD_TYPE }}

- name: Test
working-directory: ${{ env.BUILD_DIR }}
run: ctest -C ${{env.BUILD_TYPE}}
4 changes: 2 additions & 2 deletions Docs/getting-started.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ Library is officially supported on the following platforms:

**Compilers:**

* gcc 5.0+
* clang 5.0+
* gcc 7.0+
* clang 6.0+
* MSVC 2015+

If you notice any problems/bugs, please file an issue on the 7bitInjector_ GitHub Issue Tracker. Pull requests containing fixes are welcome!
Expand Down
5 changes: 2 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
[![DevCI](https://github.com/7bitcoder/7bitinjector/actions/workflows/DevCI.yml/badge.svg?branch=dev)](https://github.com/7bitcoder/7bitinjector/actions/workflows/DevCI.ym)

[![MainCI](https://github.com/7bitcoder/7bitinjector/actions/workflows/MainCI.yml/badge.svg?branch=main)](https://github.com/7bitcoder/7bitinjector/actions/workflows/MainCI.ym)
[![DevCI](https://github.com/7bitcoder/7bitinjector/actions/workflows/DevCI.yml/badge.svg?branch=dev)](https://github.com/7bitcoder/7bitinjector/actions/workflows/DevCI.yml)
[![MainCI](https://github.com/7bitcoder/7bitinjector/actions/workflows/MainCI.yml/badge.svg?branch=main)](https://github.com/7bitcoder/7bitinjector/actions/workflows/MainCI.yml)
<div align="center">

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