From f4ebb4f185ce956bf50b93acbef1516030ecdb36 Mon Sep 17 00:00:00 2001 From: Daniil Goncharov Date: Wed, 10 Aug 2022 14:53:38 +0400 Subject: [PATCH] update ci (#205) --- .github/workflows/macos.yml | 30 ++++++++++++------- .github/workflows/ubuntu.yml | 54 +++++++++++++++++++++++++++++------ .github/workflows/windows.yml | 32 +++++++++++++++------ CMakeLists.txt | 2 +- 4 files changed, 89 insertions(+), 29 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 8e14948..9fcfdc3 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -9,19 +9,27 @@ jobs: fail-fast: false matrix: config: - - { os: macos-10.15 } # https://github.com/actions/virtual-environments/blob/main/images/macos/macos-10.15-Readme.md#xcode - - { os: macos-11.0 } # https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11.0-Readme.md#xcode - build: [Debug, Release] + - { os: macos-11 } # https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11-Readme.md#xcode + - { os: macos-12 } # https://github.com/actions/virtual-environments/blob/main/images/macos/macos-12-Readme.md#xcode - name: "${{matrix.config.os}}:${{matrix.build}}" + name: "${{matrix.config.os}}" steps: - uses: actions/checkout@v2 - - name: Configure CMake - run: cmake -DCMAKE_BUILD_TYPE=${{matrix.build}} + - name: Build Release + run: | + rm -rf build + mkdir build + cd build + cmake .. -DCMAKE_BUILD_TYPE=Release + cmake --build . --config Release + ctest --output-on-failure -C Release - - name: Build - run: cmake --build . --config ${{matrix.build}} - - - name: Tests - run: ctest --output-on-failure -C ${{matrix.build}} + - name: Build Debug + run: | + rm -rf build + mkdir build + cd build + cmake .. -DCMAKE_BUILD_TYPE=Debug + cmake --build . --config Debug + ctest --output-on-failure -C Debug diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 8c38d32..c2b67e4 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -8,23 +8,61 @@ jobs: strategy: fail-fast: false matrix: - build: [Debug, Release] compiler: - { cc: "gcc-9", cxx: "g++-9" } - { cc: "gcc-10", cxx: "g++-10" } + - { cc: "gcc-11", cxx: "g++-11" } + - { cc: "clang-9", cxx: "clang++-9" } - { cc: "clang-10", cxx: "clang++-10" } - { cc: "clang-11", cxx: "clang++-11" } - { cc: "clang-12", cxx: "clang++-12" } + - { cc: "clang-13", cxx: "clang++-13" } + - { cc: "clang-14", cxx: "clang++-14" } + - { cc: "clang-15", cxx: "clang++-15" } + - { cc: "clang-16", cxx: "clang++-16" } - name: "${{matrix.compiler.cxx}}:${{matrix.build}}" + name: "${{matrix.compiler.cc}}" steps: - uses: actions/checkout@v2 - - name: Configure CMake - run: cmake -DCMAKE_BUILD_TYPE=${{matrix.build}} -DCMAKE_C_COMPILER=${{matrix.compiler.cc}} -DCMAKE_CXX_COMPILER=${{matrix.compiler.cxx}} + - name: Configure clang + run: | + if [[ "${{matrix.compiler.cc}}" == "clang"* ]]; then + wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add - + sudo apt-add-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-9 main" + sudo apt-add-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-10 main" + sudo apt-add-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-11 main" + sudo apt-add-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-12 main" + sudo apt-add-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-13 main" + sudo apt-add-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-14 main" + sudo apt-add-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-15 main" + sudo apt-add-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal main" + sudo apt update + sudo apt install ${{matrix.compiler.cc}} -y + fi - - name: Build - run: cmake --build . --config ${{matrix.build}} + - name: Configure gcc + run: | + if [[ "${{matrix.compiler.cc}}" == "gcc"* ]]; then + sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y + sudo apt update + sudo apt install ${{matrix.compiler.cxx}} -y + fi - - name: Tests - run: ctest --output-on-failure -C ${{matrix.build}} + - name: Build Release + run: | + rm -rf build + mkdir build + cd build + cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=${{matrix.compiler.cxx}} + cmake --build . --config Release + ctest --output-on-failure -C Release + + - name: Build Debug + run: | + rm -rf build + mkdir build + cd build + cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=${{matrix.compiler.cxx}} + cmake --build . --config Debug + ctest --output-on-failure -C Debug diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 5306bc9..5c82948 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -11,18 +11,32 @@ jobs: config: - { os: windows-2019, vs: "Visual Studio 2019" } # https://github.com/actions/virtual-environments/blob/main/images/win/Windows2019-Readme.md#visual-studio-enterprise-2019 - { os: windows-2022, vs: "Visual Studio 2022" } # https://github.com/actions/virtual-environments/blob/main/images/win/Windows2022-Readme.md#visual-studio-enterprise-2022 - build: [Debug, Release] - platform: [Win32, x64] - name: "${{matrix.config.vs}}:${{matrix.platform}}:${{matrix.build}}" + name: "${{matrix.config.vs}}" steps: - uses: actions/checkout@v2 - - name: Configure CMake - run: cmake -A ${{matrix.platform}} + - name: Build Win32 + shell: bash + run: | + rm -rf build + mkdir build + cd build + cmake .. -A Win32 + cmake --build . --config Release + ctest --output-on-failure -C Release + cmake --build . --config Debug + ctest --output-on-failure -C Debug - - name: Build - run: cmake --build . --config ${{matrix.build}} + - name: Build x64 + shell: bash + run: | + rm -rf build + mkdir build + cd build + cmake .. -A x64 + cmake --build . --config Release + ctest --output-on-failure -C Release + cmake --build . --config Debug + ctest --output-on-failure -C Debug - - name: Tests - run: ctest --output-on-failure -C ${{matrix.build}} diff --git a/CMakeLists.txt b/CMakeLists.txt index 21bac93..d72313e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ else() set(IS_TOPLEVEL_PROJECT FALSE) endif() -option(MAGIC_ENUM_OPT_ENABLE_NONASCII "Enable support for non-ASCII enumeration identifier" ${IS_TOPLEVEL_PROJECT}) +option(MAGIC_ENUM_OPT_ENABLE_NONASCII "Enable support for non-ASCII enumeration identifier" OFF) option(MAGIC_ENUM_OPT_BUILD_EXAMPLES "Build magic_enum examples" ${IS_TOPLEVEL_PROJECT}) option(MAGIC_ENUM_OPT_BUILD_TESTS "Build and perform magic_enum tests" ${IS_TOPLEVEL_PROJECT}) option(MAGIC_ENUM_OPT_INSTALL "Generate and install magic_enum target" ${IS_TOPLEVEL_PROJECT})