🐛 Fixed CI build
This commit is contained in:
parent
2239878804
commit
3961ca7a42
32
.github/workflows/main.yml
vendored
32
.github/workflows/main.yml
vendored
@ -18,7 +18,7 @@ jobs:
|
||||
uses: actions/cache@v3.2.6
|
||||
with:
|
||||
key: conan-win-${{ hashFiles('conanfile.txt') }}
|
||||
path: ~/.conan/
|
||||
path: ~/.conan2/
|
||||
|
||||
- name: Install dependencies
|
||||
run: choco install conan ninja -y
|
||||
@ -28,16 +28,15 @@ jobs:
|
||||
|
||||
- name: Build
|
||||
run: |
|
||||
conan config set storage.download_cache="$env:TMP"
|
||||
conan install . -b missing -pr:b=tools/conan-profiles/vs-22-release-ninja -pr=tools/conan-profiles/vs-22-release-ninja
|
||||
cmake . -GNinja -DCMAKE_BUILD_TYPE=Release -DBUILD_TEST=ON -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DCMAKE_POLICY_DEFAULT_CMP0091=NEW
|
||||
cmake --preset conan-release -DBUILD_TEST=ON
|
||||
ninja
|
||||
|
||||
- name: Test
|
||||
run: ctest -j2 --output-on-failure
|
||||
|
||||
- name: Clean Conan pkgs
|
||||
run: conan remove "*" -fsb
|
||||
run: conan cache clean "*" -sbd
|
||||
|
||||
build-gcc:
|
||||
name: Linux
|
||||
@ -51,22 +50,20 @@ jobs:
|
||||
uses: actions/cache@v3.2.6
|
||||
with:
|
||||
key: conan-linux-${{ hashFiles('conanfile.txt') }}
|
||||
path: ~/.conan/
|
||||
path: ~/.conan2/
|
||||
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
sudo apt-get update
|
||||
curl "https://raw.githubusercontent.com/AnotherFoxGuy/ci-scripts/main/install-cmake.sh" | sudo bash
|
||||
curl "https://raw.githubusercontent.com/AnotherFoxGuy/ci-scripts/main/install-conan.sh" | sudo bash
|
||||
curl "https://raw.githubusercontent.com/AnotherFoxGuy/ci-scripts/main/install-conan2.0.sh" | sudo bash
|
||||
sudo apt-get -y install ninja-build
|
||||
|
||||
- name: Configure
|
||||
run: |
|
||||
conan profile new --detect --force default
|
||||
conan profile update conf.tools.cmake.cmaketoolchain:generator="Ninja" default
|
||||
conan profile update settings.compiler.libcxx=libstdc++11 default
|
||||
conan install . -s build_type=Release -b missing -pr:b=default
|
||||
cmake . -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DBUILD_TEST=ON
|
||||
conan profile detect --force
|
||||
conan install . -s build_type=Release -b missing -pr:b=default -c tools.cmake.cmaketoolchain:generator="Ninja"
|
||||
cmake --preset conan-release -DBUILD_TEST=ON
|
||||
|
||||
- name: Build
|
||||
run: |
|
||||
@ -76,7 +73,7 @@ jobs:
|
||||
run: ctest -j2 --output-on-failure
|
||||
|
||||
- name: Clean Conan pkgs
|
||||
run: conan remove "*" -fsb
|
||||
run: conan cache clean "*" -sbd
|
||||
|
||||
build-appleclang:
|
||||
name: MacOS
|
||||
@ -88,17 +85,16 @@ jobs:
|
||||
uses: actions/cache@v3.2.6
|
||||
with:
|
||||
key: conan-mac-${{ hashFiles('conanfile.txt') }}
|
||||
path: ~/.conan/
|
||||
path: ~/.conan2/
|
||||
|
||||
- name: Install dependencies
|
||||
run: brew install conan ninja
|
||||
|
||||
- name: Build
|
||||
run: |
|
||||
conan profile new --detect --force default
|
||||
conan profile update conf.tools.cmake.cmaketoolchain:generator="Ninja" default
|
||||
conan install . -s build_type=Release -b missing -pr:b=default
|
||||
cmake . -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DBUILD_TEST=ON
|
||||
conan profile detect --force
|
||||
conan install . -s build_type=Release -b missing -pr:b=default -c tools.cmake.cmaketoolchain:generator="Ninja"
|
||||
cmake --preset conan-release -DBUILD_TEST=ON
|
||||
ninja
|
||||
shell: bash
|
||||
|
||||
@ -107,4 +103,4 @@ jobs:
|
||||
shell: bash
|
||||
|
||||
- name: Clean Conan pkgs
|
||||
run: conan remove "*" -fsb
|
||||
run: conan cache clean "*" -sbd
|
12
.github/workflows/sonarcloud.yml
vendored
12
.github/workflows/sonarcloud.yml
vendored
@ -45,20 +45,18 @@ jobs:
|
||||
uses: actions/cache@v3.2.6
|
||||
with:
|
||||
key: conan-linux-${{ hashFiles('conanfile.txt') }}
|
||||
path: ~/.conan/
|
||||
path: ~/.conan2/
|
||||
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
curl "https://raw.githubusercontent.com/AnotherFoxGuy/ci-scripts/main/install-cmake.sh" | sudo bash
|
||||
curl "https://raw.githubusercontent.com/AnotherFoxGuy/ci-scripts/main/install-conan.sh" | sudo bash
|
||||
curl "https://raw.githubusercontent.com/AnotherFoxGuy/ci-scripts/main/install-conan2.0.sh" | sudo bash
|
||||
|
||||
- name: Configure
|
||||
run: |
|
||||
conan profile new --detect --force default
|
||||
conan profile update conf.tools.cmake.cmaketoolchain:generator="Ninja" default
|
||||
conan profile update settings.compiler.libcxx=libstdc++11 default
|
||||
conan profile detect --force
|
||||
conan install . -s build_type=Release -b missing -pr:b=default
|
||||
cmake . -DCMAKE_BUILD_TYPE=Release -DBUILD_TEST=ON -DENABLE_COVERAGE=ON -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake"
|
||||
cmake --preset conan-release -DBUILD_TEST=ON -DENABLE_COVERAGE=ON
|
||||
|
||||
- name: Run build-wrapper
|
||||
run: build-wrapper-linux-x86-64 --out-dir bw-output make -j4
|
||||
@ -77,4 +75,4 @@ jobs:
|
||||
run: ./run-sonar-scanner
|
||||
|
||||
- name: Clean Conan pkgs
|
||||
run: conan remove "*" -fsb
|
||||
run: conan cache clean "*" -sbd
|
1
.gitignore
vendored
1
.gitignore
vendored
@ -6,3 +6,4 @@ docs/
|
||||
build/
|
||||
_build/
|
||||
*.html
|
||||
CMakeUserPresets.json
|
||||
|
@ -1,11 +1,8 @@
|
||||
[settings]
|
||||
os=Windows
|
||||
os_build=Windows
|
||||
arch=x86_64
|
||||
arch_build=x86_64
|
||||
compiler=Visual Studio
|
||||
compiler.version=16
|
||||
compiler=msvc
|
||||
compiler.version=192
|
||||
compiler.runtime=dynamic
|
||||
compiler.runtime_type=Debug
|
||||
build_type=Debug
|
||||
[options]
|
||||
[build_requires]
|
||||
[env]
|
||||
|
@ -1,10 +1,10 @@
|
||||
[settings]
|
||||
os=Windows
|
||||
os_build=Windows
|
||||
arch=x86_64
|
||||
arch_build=x86_64
|
||||
compiler=Visual Studio
|
||||
compiler.version=16
|
||||
compiler=msvc
|
||||
compiler.version=192
|
||||
compiler.runtime=dynamic
|
||||
compiler.runtime_type=Debug
|
||||
build_type=Debug
|
||||
[conf]
|
||||
tools.cmake.cmaketoolchain:generator=Ninja
|
@ -1,11 +1,8 @@
|
||||
[settings]
|
||||
os=Windows
|
||||
os_build=Windows
|
||||
arch=x86_64
|
||||
arch_build=x86_64
|
||||
compiler=Visual Studio
|
||||
compiler.version=16
|
||||
compiler=msvc
|
||||
compiler.version=192
|
||||
compiler.runtime=dynamic
|
||||
compiler.runtime_type=Release
|
||||
build_type=Release
|
||||
[options]
|
||||
[build_requires]
|
||||
[env]
|
||||
|
@ -1,10 +1,10 @@
|
||||
[settings]
|
||||
os=Windows
|
||||
os_build=Windows
|
||||
arch=x86_64
|
||||
arch_build=x86_64
|
||||
compiler=Visual Studio
|
||||
compiler.version=16
|
||||
compiler=msvc
|
||||
compiler.version=192
|
||||
compiler.runtime=dynamic
|
||||
compiler.runtime_type=Release
|
||||
build_type=Release
|
||||
[conf]
|
||||
tools.cmake.cmaketoolchain:generator=Ninja
|
@ -6,6 +6,3 @@ arch_build=x86_64
|
||||
compiler=Visual Studio
|
||||
compiler.version=16
|
||||
build_type=RelWithDebInfo
|
||||
[options]
|
||||
[build_requires]
|
||||
[env]
|
||||
|
@ -1,11 +1,8 @@
|
||||
[settings]
|
||||
os=Windows
|
||||
os_build=Windows
|
||||
arch=x86_64
|
||||
arch_build=x86_64
|
||||
compiler=Visual Studio
|
||||
compiler.version=17
|
||||
compiler=msvc
|
||||
compiler.version=193
|
||||
compiler.runtime=dynamic
|
||||
compiler.runtime_type=Debug
|
||||
build_type=Debug
|
||||
[options]
|
||||
[build_requires]
|
||||
[env]
|
||||
|
@ -1,10 +1,10 @@
|
||||
[settings]
|
||||
os=Windows
|
||||
os_build=Windows
|
||||
arch=x86_64
|
||||
arch_build=x86_64
|
||||
compiler=Visual Studio
|
||||
compiler.version=17
|
||||
compiler=msvc
|
||||
compiler.version=193
|
||||
compiler.runtime=dynamic
|
||||
compiler.runtime_type=Debug
|
||||
build_type=Debug
|
||||
[conf]
|
||||
tools.cmake.cmaketoolchain:generator=Ninja
|
@ -1,11 +1,8 @@
|
||||
[settings]
|
||||
os=Windows
|
||||
os_build=Windows
|
||||
arch=x86_64
|
||||
arch_build=x86_64
|
||||
compiler=Visual Studio
|
||||
compiler.version=17
|
||||
compiler=msvc
|
||||
compiler.version=193
|
||||
compiler.runtime=dynamic
|
||||
compiler.runtime_type=Release
|
||||
build_type=Release
|
||||
[options]
|
||||
[build_requires]
|
||||
[env]
|
||||
|
@ -1,10 +1,10 @@
|
||||
[settings]
|
||||
os=Windows
|
||||
os_build=Windows
|
||||
arch=x86_64
|
||||
arch_build=x86_64
|
||||
compiler=Visual Studio
|
||||
compiler.version=17
|
||||
compiler=msvc
|
||||
compiler.version=193
|
||||
compiler.runtime=dynamic
|
||||
compiler.runtime_type=Release
|
||||
build_type=Release
|
||||
[conf]
|
||||
tools.cmake.cmaketoolchain:generator=Ninja
|
@ -1,11 +1,8 @@
|
||||
[settings]
|
||||
os=Windows
|
||||
os_build=Windows
|
||||
arch=x86_64
|
||||
arch_build=x86_64
|
||||
compiler=Visual Studio
|
||||
compiler.version=17
|
||||
compiler=msvc
|
||||
compiler.version=193
|
||||
compiler.runtime=dynamic
|
||||
compiler.runtime_type=RelWithDebInfo
|
||||
build_type=RelWithDebInfo
|
||||
[options]
|
||||
[build_requires]
|
||||
[env]
|
||||
|
Loading…
x
Reference in New Issue
Block a user