AnotherFoxGuy/MofileReader
1
0
Fork 0
Code Issues Pull Requests Releases Activity

🐛 Fixed CI build

Browse Source
This commit is contained in:
Edgar 2023-03-10 10:40:27 +01:00
parent 2239878804
commit 3961ca7a42
13 changed files with 59 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
.github/workflows/main.yml vendored
View File

@ -18,7 +18,7 @@ jobs:
uses: actions/cache@v3.2.6 uses: actions/cache@v3.2.6
with: with:
key: conan-win-${{ hashFiles('conanfile.txt') }} key: conan-win-${{ hashFiles('conanfile.txt') }}
path: ~/.conan/ path: ~/.conan2/
- name: Install dependencies - name: Install dependencies
run: choco install conan ninja -y run: choco install conan ninja -y
@ -28,16 +28,15 @@ jobs:
- name: Build - name: Build
run: | 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 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 ninja
- name: Test - name: Test
run: ctest -j2 --output-on-failure run: ctest -j2 --output-on-failure
- name: Clean Conan pkgs - name: Clean Conan pkgs
run: conan remove "*" -fsb run: conan cache clean "*" -sbd
build-gcc: build-gcc:
name: Linux name: Linux
@ -51,22 +50,20 @@ jobs:
uses: actions/cache@v3.2.6 uses: actions/cache@v3.2.6
with: with:
key: conan-linux-${{ hashFiles('conanfile.txt') }} key: conan-linux-${{ hashFiles('conanfile.txt') }}
path: ~/.conan/ path: ~/.conan2/
- name: Install dependencies - name: Install dependencies
run: | run: |
sudo apt-get update 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-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 sudo apt-get -y install ninja-build
- name: Configure - name: Configure
run: | run: |
conan profile new --detect --force default conan profile detect --force
conan profile update conf.tools.cmake.cmaketoolchain:generator="Ninja" default conan install . -s build_type=Release -b missing -pr:b=default -c tools.cmake.cmaketoolchain:generator="Ninja"
conan profile update settings.compiler.libcxx=libstdc++11 default cmake --preset conan-release -DBUILD_TEST=ON
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
- name: Build - name: Build
run: | run: |
@ -76,7 +73,7 @@ jobs:
run: ctest -j2 --output-on-failure run: ctest -j2 --output-on-failure
- name: Clean Conan pkgs - name: Clean Conan pkgs
run: conan remove "*" -fsb run: conan cache clean "*" -sbd
build-appleclang: build-appleclang:
name: MacOS name: MacOS
@ -88,17 +85,16 @@ jobs:
uses: actions/cache@v3.2.6 uses: actions/cache@v3.2.6
with: with:
key: conan-mac-${{ hashFiles('conanfile.txt') }} key: conan-mac-${{ hashFiles('conanfile.txt') }}
path: ~/.conan/ path: ~/.conan2/
- name: Install dependencies - name: Install dependencies
run: brew install conan ninja run: brew install conan ninja
- name: Build - name: Build
run: | run: |
conan profile new --detect --force default conan profile detect --force
conan profile update conf.tools.cmake.cmaketoolchain:generator="Ninja" default conan install . -s build_type=Release -b missing -pr:b=default -c tools.cmake.cmaketoolchain:generator="Ninja"
conan install . -s build_type=Release -b missing -pr:b=default cmake --preset conan-release -DBUILD_TEST=ON
cmake . -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DBUILD_TEST=ON
ninja ninja
shell: bash shell: bash
@ -107,4 +103,4 @@ jobs:
shell: bash shell: bash
- name: Clean Conan pkgs - name: Clean Conan pkgs
run: conan remove "*" -fsb run: conan cache clean "*" -sbd

12
.github/workflows/sonarcloud.yml vendored
View File

@ -45,20 +45,18 @@ jobs:
uses: actions/cache@v3.2.6 uses: actions/cache@v3.2.6
with: with:
key: conan-linux-${{ hashFiles('conanfile.txt') }} key: conan-linux-${{ hashFiles('conanfile.txt') }}
path: ~/.conan/ path: ~/.conan2/
- name: Install dependencies - name: Install dependencies
run: | 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-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 - name: Configure
run: | run: |
conan profile new --detect --force default conan profile detect --force
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 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 - name: Run build-wrapper
run: build-wrapper-linux-x86-64 --out-dir bw-output make -j4 run: build-wrapper-linux-x86-64 --out-dir bw-output make -j4
@ -77,4 +75,4 @@ jobs:
run: ./run-sonar-scanner run: ./run-sonar-scanner
- name: Clean Conan pkgs - name: Clean Conan pkgs
run: conan remove "*" -fsb run: conan cache clean "*" -sbd

1
.gitignore vendored
View File

@ -6,3 +6,4 @@ docs/
build/ build/
_build/ _build/
*.html *.html
CMakeUserPresets.json

11
tools/conan-profiles/vs-19-debug
View File

@ -1,11 +1,8 @@
[settings] [settings]
os=Windows os=Windows
os_build=Windows
arch=x86_64 arch=x86_64
arch_build=x86_64 compiler=msvc
compiler=Visual Studio compiler.version=192
compiler.version=16 compiler.runtime=dynamic
compiler.runtime_type=Debug
build_type=Debug build_type=Debug
[options]
[build_requires]
[env]

8
tools/conan-profiles/vs-19-debug-ninja
View File

@ -1,10 +1,10 @@
[settings] [settings]
os=Windows os=Windows
os_build=Windows
arch=x86_64 arch=x86_64
arch_build=x86_64 compiler=msvc
compiler=Visual Studio compiler.version=192
compiler.version=16 compiler.runtime=dynamic
compiler.runtime_type=Debug
build_type=Debug build_type=Debug
[conf] [conf]
tools.cmake.cmaketoolchain:generator=Ninja tools.cmake.cmaketoolchain:generator=Ninja

11
tools/conan-profiles/vs-19-release
View File

@ -1,11 +1,8 @@
[settings] [settings]
os=Windows os=Windows
os_build=Windows
arch=x86_64 arch=x86_64
arch_build=x86_64 compiler=msvc
compiler=Visual Studio compiler.version=192
compiler.version=16 compiler.runtime=dynamic
compiler.runtime_type=Release
build_type=Release build_type=Release
[options]
[build_requires]
[env]

8
tools/conan-profiles/vs-19-release-ninja
View File

@ -1,10 +1,10 @@
[settings] [settings]
os=Windows os=Windows
os_build=Windows
arch=x86_64 arch=x86_64
arch_build=x86_64 compiler=msvc
compiler=Visual Studio compiler.version=192
compiler.version=16 compiler.runtime=dynamic
compiler.runtime_type=Release
build_type=Release build_type=Release
[conf] [conf]
tools.cmake.cmaketoolchain:generator=Ninja tools.cmake.cmaketoolchain:generator=Ninja

5
tools/conan-profiles/vs-19-relwithdebinfo
View File

@ -5,7 +5,4 @@ arch=x86_64
arch_build=x86_64 arch_build=x86_64
compiler=Visual Studio compiler=Visual Studio
compiler.version=16 compiler.version=16
build_type=RelWithDebInfo build_type=RelWithDebInfo
[options]
[build_requires]
[env]

13
tools/conan-profiles/vs-22-debug
View File

@ -1,11 +1,8 @@
[settings] [settings]
os=Windows os=Windows
os_build=Windows
arch=x86_64 arch=x86_64
arch_build=x86_64 compiler=msvc
compiler=Visual Studio compiler.version=193
compiler.version=17 compiler.runtime=dynamic
build_type=Debug compiler.runtime_type=Debug
[options] build_type=Debug
[build_requires]
[env]

8
tools/conan-profiles/vs-22-debug-ninja
View File

@ -1,10 +1,10 @@
[settings] [settings]
os=Windows os=Windows
os_build=Windows
arch=x86_64 arch=x86_64
arch_build=x86_64 compiler=msvc
compiler=Visual Studio compiler.version=193
compiler.version=17 compiler.runtime=dynamic
compiler.runtime_type=Debug
build_type=Debug build_type=Debug
[conf] [conf]
tools.cmake.cmaketoolchain:generator=Ninja tools.cmake.cmaketoolchain:generator=Ninja

13
tools/conan-profiles/vs-22-release
View File

@ -1,11 +1,8 @@
[settings] [settings]
os=Windows os=Windows
os_build=Windows
arch=x86_64 arch=x86_64
arch_build=x86_64 compiler=msvc
compiler=Visual Studio compiler.version=193
compiler.version=17 compiler.runtime=dynamic
build_type=Release compiler.runtime_type=Release
[options] build_type=Release
[build_requires]
[env]

8
tools/conan-profiles/vs-22-release-ninja
View File

@ -1,10 +1,10 @@
[settings] [settings]
os=Windows os=Windows
os_build=Windows
arch=x86_64 arch=x86_64
arch_build=x86_64 compiler=msvc
compiler=Visual Studio compiler.version=193
compiler.version=17 compiler.runtime=dynamic
compiler.runtime_type=Release
build_type=Release build_type=Release
[conf] [conf]
tools.cmake.cmaketoolchain:generator=Ninja tools.cmake.cmaketoolchain:generator=Ninja

11
tools/conan-profiles/vs-22-relwithdebinfo
View File

@ -1,11 +1,8 @@
[settings] [settings]
os=Windows os=Windows
os_build=Windows
arch=x86_64 arch=x86_64
arch_build=x86_64 compiler=msvc
compiler=Visual Studio compiler.version=193
compiler.version=17 compiler.runtime=dynamic
compiler.runtime_type=RelWithDebInfo
build_type=RelWithDebInfo build_type=RelWithDebInfo
[options]
[build_requires]
[env]