From b44b438e5eccfb2dfa137db99a9279b52e1cb7fb Mon Sep 17 00:00:00 2001 From: 7bitcoder Date: Fri, 12 May 2023 21:36:46 +0200 Subject: [PATCH 1/5] update ci --- .github/workflows/MainCI.yml | 20 ++++++++++---------- README.md | 5 ++--- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.github/workflows/MainCI.yml b/.github/workflows/MainCI.yml index c2737d3..4300a5d 100644 --- a/.github/workflows/MainCI.yml +++ b/.github/workflows/MainCI.yml @@ -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, 10, 11] + os: [ubuntu-20.04] runs-on: ${{ matrix.os }} @@ -54,9 +54,9 @@ jobs: test-mingw: strategy: matrix: - libraryType: [HeaderOnly, Static] + libraryType: [Static] version: [7, 10, 12] - os: [windows-2022] + os: [windows-2019] runs-on: ${{ matrix.os }} @@ -86,9 +86,9 @@ jobs: test-clang: strategy: matrix: - libraryType: [HeaderOnly, Static] - version: [6, 10, 15] - os: [windows-2022, ubuntu-22.04] + libraryType: [Static] + version: [6.0, 10, 15] + os: [windows-2022, ubuntu-20.04] runs-on: ${{ matrix.os }} @@ -119,8 +119,8 @@ jobs: strategy: fail-fast: false matrix: - libraryType: [HeaderOnly, Static] - version: [14, 15, 17] + libraryType: [Static] + version: [14.0, 15.0, 17.0] os: [windows-2022] runs-on: ${{ matrix.os }} diff --git a/README.md b/README.md index 00d5d6e..7297aab 100644 --- a/README.md +++ b/README.md @@ -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)
logo From 5611f4abf0afbedc4fe35356184d637ee7ee57b7 Mon Sep 17 00:00:00 2001 From: 7bitcoder Date: Sat, 13 May 2023 11:48:06 +0200 Subject: [PATCH 2/5] update CI --- .github/workflows/MainCI.yml | 45 +++++------------------------------- Docs/getting-started.rst | 4 ++-- 2 files changed, 8 insertions(+), 41 deletions(-) diff --git a/.github/workflows/MainCI.yml b/.github/workflows/MainCI.yml index 4300a5d..655435d 100644 --- a/.github/workflows/MainCI.yml +++ b/.github/workflows/MainCI.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: libraryType: [Static] - version: [7, 10, 11] + version: [7, 8, 10, 11] os: [ubuntu-20.04] runs-on: ${{ matrix.os }} @@ -51,44 +51,12 @@ jobs: working-directory: ${{ env.BUILD_DIR }} run: ctest -C ${{env.BUILD_TYPE}} - test-mingw: - strategy: - matrix: - libraryType: [Static] - version: [7, 10, 12] - os: [windows-2019] - - 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: [Static] - version: [6.0, 10, 15] - os: [windows-2022, ubuntu-20.04] + version: [6, 13, 14, 15] + os: [ubuntu-20.04] runs-on: ${{ matrix.os }} @@ -120,7 +88,7 @@ jobs: fail-fast: false matrix: libraryType: [Static] - version: [14.0, 15.0, 17.0] + version: [14.0, 15.0, 16.0, 17.0] os: [windows-2022] runs-on: ${{ matrix.os }} @@ -128,11 +96,10 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Install MSVC - uses: TheMrMilchmann/setup-msvc-dev@v2.0.0 + - name: Enable Developer Command Prompt + uses: ilammy/msvc-dev-cmd@v1.12.1 with: toolset: ${{ matrix.version }} - arch: x64 - name: Install Conan Packages uses: ./.github/actions/conan-install diff --git a/Docs/getting-started.rst b/Docs/getting-started.rst index 62c4d30..4c969d0 100644 --- a/Docs/getting-started.rst +++ b/Docs/getting-started.rst @@ -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! From 5d9168cd1d1ac99d259af1d0cbb8eb964734c0c3 Mon Sep 17 00:00:00 2001 From: 7bitcoder Date: Sat, 13 May 2023 11:54:49 +0200 Subject: [PATCH 3/5] fix vsversion in CI --- .github/workflows/MainCI.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/MainCI.yml b/.github/workflows/MainCI.yml index 655435d..1e5d124 100644 --- a/.github/workflows/MainCI.yml +++ b/.github/workflows/MainCI.yml @@ -88,7 +88,7 @@ jobs: fail-fast: false matrix: libraryType: [Static] - version: [14.0, 15.0, 16.0, 17.0] + version: ["2015", "2017", "2019", "2022"] os: [windows-2022] runs-on: ${{ matrix.os }} @@ -96,10 +96,10 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Enable Developer Command Prompt + - name: Install Msvc uses: ilammy/msvc-dev-cmd@v1.12.1 with: - toolset: ${{ matrix.version }} + vsversion: ${{ matrix.version }} - name: Install Conan Packages uses: ./.github/actions/conan-install From c2748d2fc506154b934abf8eff44178be2e6eaf5 Mon Sep 17 00:00:00 2001 From: 7bitcoder Date: Sat, 13 May 2023 12:02:03 +0200 Subject: [PATCH 4/5] fix vsversion in CI --- .github/workflows/MainCI.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/MainCI.yml b/.github/workflows/MainCI.yml index 1e5d124..fa33107 100644 --- a/.github/workflows/MainCI.yml +++ b/.github/workflows/MainCI.yml @@ -88,7 +88,7 @@ jobs: fail-fast: false matrix: libraryType: [Static] - version: ["2015", "2017", "2019", "2022"] + version: ["[14.0,14.9)", "[15.0,15.9)", "[16.0,16.9)", "[17.0,17.9)"] os: [windows-2022] runs-on: ${{ matrix.os }} @@ -97,9 +97,9 @@ jobs: - uses: actions/checkout@v3 - name: Install Msvc - uses: ilammy/msvc-dev-cmd@v1.12.1 + uses: microsoft/setup-msbuild@v1.1 with: - vsversion: ${{ matrix.version }} + vs-version: ${{ matrix.version }} - name: Install Conan Packages uses: ./.github/actions/conan-install From 3f715df7702af6cf9a55649a858029900ffc68aa Mon Sep 17 00:00:00 2001 From: 7bitcoder Date: Sat, 13 May 2023 12:03:27 +0200 Subject: [PATCH 5/5] rem msvc --- .github/workflows/MainCI.yml | 33 --------------------------------- 1 file changed, 33 deletions(-) diff --git a/.github/workflows/MainCI.yml b/.github/workflows/MainCI.yml index fa33107..4dd785e 100644 --- a/.github/workflows/MainCI.yml +++ b/.github/workflows/MainCI.yml @@ -82,36 +82,3 @@ jobs: - name: Test working-directory: ${{ env.BUILD_DIR }} run: ctest -C ${{env.BUILD_TYPE}} - - test-msvc: - strategy: - fail-fast: false - matrix: - libraryType: [Static] - version: ["[14.0,14.9)", "[15.0,15.9)", "[16.0,16.9)", "[17.0,17.9)"] - os: [windows-2022] - - runs-on: ${{ matrix.os }} - - steps: - - uses: actions/checkout@v3 - - - name: Install Msvc - uses: microsoft/setup-msbuild@v1.1 - with: - vs-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}}