From f0fd7451b470fa76ac2dbdd66dd0f04ea0e7b5b5 Mon Sep 17 00:00:00 2001 From: Dominik Berner Date: Wed, 8 Nov 2023 22:56:16 +0100 Subject: [PATCH 1/3] Version bump to 2.5.4 --- CHANGELOG.md | 4 ++++ CMakeLists.txt | 2 +- include/SI/absorbed_dose.h | 2 +- include/SI/acceleration.h | 2 +- include/SI/angle.h | 2 +- include/SI/angular_frequency.h | 2 +- include/SI/area.h | 2 +- include/SI/astronomic.h | 2 +- include/SI/catalytic_activity.h | 2 +- include/SI/detail/cross_unit_operations.h | 2 +- include/SI/detail/detail.h | 2 +- include/SI/detail/eps_equal.h | 2 +- include/SI/detail/number_parser.h | 2 +- include/SI/detail/operator_helpers.h | 2 +- include/SI/detail/unit.h | 2 +- include/SI/detail/unit_cast.h | 2 +- include/SI/detail/unit_symbol.h | 2 +- include/SI/electric_capacity.h | 2 +- include/SI/electric_charge.h | 2 +- include/SI/electric_conductance.h | 2 +- include/SI/electric_current.h | 2 +- include/SI/electric_potential.h | 2 +- include/SI/electric_resistance.h | 2 +- include/SI/energy.h | 2 +- include/SI/equivalent_dose.h | 2 +- include/SI/flow.h | 2 +- include/SI/force.h | 2 +- include/SI/frequency.h | 2 +- include/SI/illuminance.h | 2 +- include/SI/inductance.h | 2 +- include/SI/length.h | 2 +- include/SI/luminosity.h | 2 +- include/SI/luminous_flux.h | 2 +- include/SI/magnetic_field.h | 2 +- include/SI/magnetic_flux.h | 2 +- include/SI/mass.h | 2 +- include/SI/momentum.h | 2 +- include/SI/power.h | 2 +- include/SI/pressure.h | 2 +- include/SI/radioactivity.h | 2 +- include/SI/solid_angle.h | 2 +- include/SI/stream.h | 2 +- include/SI/substance.h | 2 +- include/SI/temperature.h | 2 +- include/SI/time.h | 2 +- include/SI/velocity.h | 2 +- 46 files changed, 49 insertions(+), 45 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 635ac89a..f291e930 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 2.5.4 + +* Introduced CMake Workflow Presets + ## 2.5.3 * Adjusted CMake to only look for Catch2 if tests are being built. Reduces warnings for projects which use something else (e.g. GTest) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5faa0b8d..42abbe50 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ endif() project( "SI" - VERSION 2.5.3 + VERSION 2.5.4 DESCRIPTION "A header only c++ library that provides type safety and user defined literals for handling physical values defined in the International System of Units." HOMEPAGE_URL "https://github.com/bernedom/SI" diff --git a/include/SI/absorbed_dose.h b/include/SI/absorbed_dose.h index 491c16c5..8dfaca96 100644 --- a/include/SI/absorbed_dose.h +++ b/include/SI/absorbed_dose.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.5.3 + * This file is part of "SI" version 2.5.4 * A header only c++ library that provides type safety and user defined literals * for handling physical values defined in the International System of * Units diff --git a/include/SI/acceleration.h b/include/SI/acceleration.h index 9c6bbfdb..0ed59115 100644 --- a/include/SI/acceleration.h +++ b/include/SI/acceleration.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.5.3 + * This file is part of "SI" version 2.5.4 * A header only c++ library that provides type safety and user defined literals * for handling physical values defined in the International System of * Units diff --git a/include/SI/angle.h b/include/SI/angle.h index 31e44972..07eefa69 100644 --- a/include/SI/angle.h +++ b/include/SI/angle.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.5.3 + * This file is part of "SI" version 2.5.4 * A header only c++ library that provides type safety and user defined literals * for handling physical values defined in the International System of * Units diff --git a/include/SI/angular_frequency.h b/include/SI/angular_frequency.h index b2f91d7b..dcba1f12 100644 --- a/include/SI/angular_frequency.h +++ b/include/SI/angular_frequency.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.5.3 + * This file is part of "SI" version 2.5.4 * A header only c++ library that provides type safety and user defined literals * for handling physical values defined in the International System of * Units diff --git a/include/SI/area.h b/include/SI/area.h index ddb175d0..9fbffeed 100644 --- a/include/SI/area.h +++ b/include/SI/area.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.5.3 + * This file is part of "SI" version 2.5.4 * A header only c++ library that provides type safety and user defined literals * for handling physical values defined in the International System of * Units diff --git a/include/SI/astronomic.h b/include/SI/astronomic.h index bef327cc..11bc92c7 100644 --- a/include/SI/astronomic.h +++ b/include/SI/astronomic.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.5.3 + * This file is part of "SI" version 2.5.4 * A header only c++ library that provides type safety and user defined literals * for handling physical values defined in the International System of * Units diff --git a/include/SI/catalytic_activity.h b/include/SI/catalytic_activity.h index 8e92f139..47de14be 100644 --- a/include/SI/catalytic_activity.h +++ b/include/SI/catalytic_activity.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.5.3 + * This file is part of "SI" version 2.5.4 * A header only c++ library that provides type safety and user defined literals * for handling physical values defined in the International System of * Units diff --git a/include/SI/detail/cross_unit_operations.h b/include/SI/detail/cross_unit_operations.h index 095da49f..fdad9a38 100644 --- a/include/SI/detail/cross_unit_operations.h +++ b/include/SI/detail/cross_unit_operations.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.5.3 + * This file is part of "SI" version 2.5.4 * A header only c++ library that provides type safety and user defined literals * for handling physical values defined in the International System of * Units diff --git a/include/SI/detail/detail.h b/include/SI/detail/detail.h index 88ca9aa9..bfae8232 100644 --- a/include/SI/detail/detail.h +++ b/include/SI/detail/detail.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.5.3 + * This file is part of "SI" version 2.5.4 * A header only c++ library that provides type safety and user defined literals * for handling physical values defined in the International System of * Units diff --git a/include/SI/detail/eps_equal.h b/include/SI/detail/eps_equal.h index 76dd688b..a78e6ae2 100644 --- a/include/SI/detail/eps_equal.h +++ b/include/SI/detail/eps_equal.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.5.3 + * This file is part of "SI" version 2.5.4 * A header only c++ library that provides type safety and user defined literals * for handling physical values defined in the International System of * Units diff --git a/include/SI/detail/number_parser.h b/include/SI/detail/number_parser.h index b365e951..ef128057 100644 --- a/include/SI/detail/number_parser.h +++ b/include/SI/detail/number_parser.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.5.3 + * This file is part of "SI" version 2.5.4 * A header only c++ library that provides type safety and user defined literals * for handling physical values defined in the International System of * Units diff --git a/include/SI/detail/operator_helpers.h b/include/SI/detail/operator_helpers.h index a6ce6161..a5fdc5c9 100644 --- a/include/SI/detail/operator_helpers.h +++ b/include/SI/detail/operator_helpers.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.5.3 + * This file is part of "SI" version 2.5.4 * A header only c++ library that provides type safety and user defined literals * for handling physical values defined in the International System of * Units diff --git a/include/SI/detail/unit.h b/include/SI/detail/unit.h index 9979dfef..a619772e 100644 --- a/include/SI/detail/unit.h +++ b/include/SI/detail/unit.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.5.3 + * This file is part of "SI" version 2.5.4 * A header only c++ library that provides type safety and user defined literals * for handling physical values defined in the International System of * Units diff --git a/include/SI/detail/unit_cast.h b/include/SI/detail/unit_cast.h index 2e2389fb..401b816a 100644 --- a/include/SI/detail/unit_cast.h +++ b/include/SI/detail/unit_cast.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.5.3 + * This file is part of "SI" version 2.5.4 * A header only c++ library that provides type safety and user defined literals * for handling physical values defined in the International System of * Units diff --git a/include/SI/detail/unit_symbol.h b/include/SI/detail/unit_symbol.h index b4612191..d59355c7 100644 --- a/include/SI/detail/unit_symbol.h +++ b/include/SI/detail/unit_symbol.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.5.3 + * This file is part of "SI" version 2.5.4 * A header only c++ library that provides type safety and user defined literals * for handling physical values defined in the International System of * Units diff --git a/include/SI/electric_capacity.h b/include/SI/electric_capacity.h index 7cc641fe..390c34ea 100644 --- a/include/SI/electric_capacity.h +++ b/include/SI/electric_capacity.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.5.3 + * This file is part of "SI" version 2.5.4 * A header only c++ library that provides type safety and user defined literals * for handling physical values defined in the International System of * Units diff --git a/include/SI/electric_charge.h b/include/SI/electric_charge.h index 14390d88..e2cc3fdf 100644 --- a/include/SI/electric_charge.h +++ b/include/SI/electric_charge.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.5.3 + * This file is part of "SI" version 2.5.4 * A header only c++ library that provides type safety and user defined literals * for handling physical values defined in the International System of * Units diff --git a/include/SI/electric_conductance.h b/include/SI/electric_conductance.h index 8b2675f0..eae2599a 100644 --- a/include/SI/electric_conductance.h +++ b/include/SI/electric_conductance.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.5.3 + * This file is part of "SI" version 2.5.4 * A header only c++ library that provides type safety and user defined literals * for handling physical values defined in the International System of * Units diff --git a/include/SI/electric_current.h b/include/SI/electric_current.h index b98cdffb..75d27b37 100644 --- a/include/SI/electric_current.h +++ b/include/SI/electric_current.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.5.3 + * This file is part of "SI" version 2.5.4 * A header only c++ library that provides type safety and user defined literals * for handling physical values defined in the International System of * Units diff --git a/include/SI/electric_potential.h b/include/SI/electric_potential.h index 9ac9df93..75597fe2 100644 --- a/include/SI/electric_potential.h +++ b/include/SI/electric_potential.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.5.3 + * This file is part of "SI" version 2.5.4 * A header only c++ library that provides type safety and user defined literals * for handling physical values defined in the International System of * Units diff --git a/include/SI/electric_resistance.h b/include/SI/electric_resistance.h index 91227906..f1c45458 100644 --- a/include/SI/electric_resistance.h +++ b/include/SI/electric_resistance.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.5.3 + * This file is part of "SI" version 2.5.4 * A header only c++ library that provides type safety and user defined literals * for handling physical values defined in the International System of * Units diff --git a/include/SI/energy.h b/include/SI/energy.h index 895aff5b..d113233a 100644 --- a/include/SI/energy.h +++ b/include/SI/energy.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.5.3 + * This file is part of "SI" version 2.5.4 * A header only c++ library that provides type safety and user defined literals * for handling physical values defined in the International System of * Units diff --git a/include/SI/equivalent_dose.h b/include/SI/equivalent_dose.h index 175c55dd..9f20910d 100644 --- a/include/SI/equivalent_dose.h +++ b/include/SI/equivalent_dose.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.5.3 + * This file is part of "SI" version 2.5.4 * A header only c++ library that provides type safety and user defined literals * for handling physical values defined in the International System of * Units diff --git a/include/SI/flow.h b/include/SI/flow.h index d8be3da7..0c349d7a 100644 --- a/include/SI/flow.h +++ b/include/SI/flow.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.5.3 + * This file is part of "SI" version 2.5.4 * A header only c++ library that provides type safety and user defined literals * for handling physical values defined in the International System of * Units diff --git a/include/SI/force.h b/include/SI/force.h index 7d85d9d2..842fc970 100644 --- a/include/SI/force.h +++ b/include/SI/force.h @@ -1,6 +1,6 @@ /** - * This file is part of "SI" version 2.5.3 + * This file is part of "SI" version 2.5.4 * A header only c++ library that provides type safety and user defined literals * for handling physical values defined in the International System of * Units diff --git a/include/SI/frequency.h b/include/SI/frequency.h index 0f4e9f7f..201750b4 100644 --- a/include/SI/frequency.h +++ b/include/SI/frequency.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.5.3 + * This file is part of "SI" version 2.5.4 * A header only c++ library that provides type safety and user defined literals * for handling physical values defined in the International System of * Units diff --git a/include/SI/illuminance.h b/include/SI/illuminance.h index 85a60038..8cc759c2 100644 --- a/include/SI/illuminance.h +++ b/include/SI/illuminance.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.5.3 + * This file is part of "SI" version 2.5.4 * A header only c++ library that provides type safety and user defined literals * for handling physical values defined in the International System of * Units diff --git a/include/SI/inductance.h b/include/SI/inductance.h index e128f090..006fd8af 100644 --- a/include/SI/inductance.h +++ b/include/SI/inductance.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.5.3 + * This file is part of "SI" version 2.5.4 * A header only c++ library that provides type safety and user defined literals * for handling physical values defined in the International System of * Units diff --git a/include/SI/length.h b/include/SI/length.h index 758e4dc9..f97d8864 100644 --- a/include/SI/length.h +++ b/include/SI/length.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.5.3 + * This file is part of "SI" version 2.5.4 * A header only c++ library that provides type safety and user defined literals * for handling physical values defined in the International System of * Units diff --git a/include/SI/luminosity.h b/include/SI/luminosity.h index d6301bef..ddddfcb4 100644 --- a/include/SI/luminosity.h +++ b/include/SI/luminosity.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.5.3 + * This file is part of "SI" version 2.5.4 * A header only c++ library that provides type safety and user defined literals * for handling physical values defined in the International System of * Units diff --git a/include/SI/luminous_flux.h b/include/SI/luminous_flux.h index aa28b71b..543cc59b 100644 --- a/include/SI/luminous_flux.h +++ b/include/SI/luminous_flux.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.5.3 + * This file is part of "SI" version 2.5.4 * A header only c++ library that provides type safety and user defined literals * for handling physical values defined in the International System of * Units diff --git a/include/SI/magnetic_field.h b/include/SI/magnetic_field.h index 04febb71..7c15546f 100644 --- a/include/SI/magnetic_field.h +++ b/include/SI/magnetic_field.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.5.3 + * This file is part of "SI" version 2.5.4 * A header only c++ library that provides type safety and user defined literals * for handling physical values defined in the International System of * Units diff --git a/include/SI/magnetic_flux.h b/include/SI/magnetic_flux.h index d3c308a6..9f112d2d 100644 --- a/include/SI/magnetic_flux.h +++ b/include/SI/magnetic_flux.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.5.3 + * This file is part of "SI" version 2.5.4 * A header only c++ library that provides type safety and user defined literals * for handling physical values defined in the International System of * Units diff --git a/include/SI/mass.h b/include/SI/mass.h index 60d915e0..7e0175ef 100644 --- a/include/SI/mass.h +++ b/include/SI/mass.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.5.3 + * This file is part of "SI" version 2.5.4 * A header only c++ library that provides type safety and user defined literals * for handling physical values defined in the International System of * Units diff --git a/include/SI/momentum.h b/include/SI/momentum.h index 7aaec544..c8f9597e 100644 --- a/include/SI/momentum.h +++ b/include/SI/momentum.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.5.3 + * This file is part of "SI" version 2.5.4 * A header only c++ library that provides type safety and user defined literals * for handling physical values defined in the International System of * Units diff --git a/include/SI/power.h b/include/SI/power.h index c93193a3..dcdb0b7f 100644 --- a/include/SI/power.h +++ b/include/SI/power.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.5.3 + * This file is part of "SI" version 2.5.4 * A header only c++ library that provides type safety and user defined literals * for handling physical values defined in the International System of * Units diff --git a/include/SI/pressure.h b/include/SI/pressure.h index 1a666268..04da9db8 100644 --- a/include/SI/pressure.h +++ b/include/SI/pressure.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.5.3 + * This file is part of "SI" version 2.5.4 * A header only c++ library that provides type safety and user defined literals * for handling physical values defined in the International System of * Units diff --git a/include/SI/radioactivity.h b/include/SI/radioactivity.h index e6096b09..47ef6094 100644 --- a/include/SI/radioactivity.h +++ b/include/SI/radioactivity.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.5.3 + * This file is part of "SI" version 2.5.4 * A header only c++ library that provides type safety and user defined literals * for handling physical values defined in the International System of * Units diff --git a/include/SI/solid_angle.h b/include/SI/solid_angle.h index ad5e9363..fe79a8fe 100644 --- a/include/SI/solid_angle.h +++ b/include/SI/solid_angle.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.5.3 + * This file is part of "SI" version 2.5.4 * A header only c++ library that provides type safety and user defined literals * for handling physical values defined in the International System of * Units diff --git a/include/SI/stream.h b/include/SI/stream.h index 8083d7c8..19ae2eea 100644 --- a/include/SI/stream.h +++ b/include/SI/stream.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.5.3 + * This file is part of "SI" version 2.5.4 * A header only c++ library that provides type safety and user defined literals * for handling physical values defined in the International System of * Units diff --git a/include/SI/substance.h b/include/SI/substance.h index 70fd0a38..8e4f0767 100644 --- a/include/SI/substance.h +++ b/include/SI/substance.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.5.3 + * This file is part of "SI" version 2.5.4 * A header only c++ library that provides type safety and user defined literals * for handling physical values defined in the International System of * Units diff --git a/include/SI/temperature.h b/include/SI/temperature.h index 8abfd390..575d0f8c 100644 --- a/include/SI/temperature.h +++ b/include/SI/temperature.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.5.3 + * This file is part of "SI" version 2.5.4 * A header only c++ library that provides type safety and user defined literals * for handling physical values defined in the International System of * Units diff --git a/include/SI/time.h b/include/SI/time.h index df2ecf64..79895f03 100644 --- a/include/SI/time.h +++ b/include/SI/time.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.5.3 + * This file is part of "SI" version 2.5.4 * A header only c++ library that provides type safety and user defined literals * for handling physical values defined in the International System of * Units diff --git a/include/SI/velocity.h b/include/SI/velocity.h index d4dbbf8a..674b31d9 100644 --- a/include/SI/velocity.h +++ b/include/SI/velocity.h @@ -1,5 +1,5 @@ /** - * This file is part of "SI" version 2.5.3 + * This file is part of "SI" version 2.5.4 * A header only c++ library that provides type safety and user defined literals * for handling physical values defined in the International System of * Units From 25a63db7eeb845e412b435bca1c1553ad53f887d Mon Sep 17 00:00:00 2001 From: Dominik Berner Date: Wed, 8 Nov 2023 23:48:01 +0100 Subject: [PATCH 2/3] Remove broken benchmark workflow --- .github/workflows/benchmark.yml | 53 --------------------------------- 1 file changed, 53 deletions(-) delete mode 100644 .github/workflows/benchmark.yml diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml deleted file mode 100644 index 1aae3971..00000000 --- a/.github/workflows/benchmark.yml +++ /dev/null @@ -1,53 +0,0 @@ -name: Continuous Benchmark -on: - push: - -jobs: - benchmark: - name: Run SI benchmarks - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: install dependencies - run: | - sudo -H pip3 install setuptools wheel - sudo -H pip3 install conan - conan profile detect --force - sudo apt-get install -y ninja-build - - - name: Build and run benchmarks with Catch2 - run: | - conan install . --output-folder=build --build=missing --settings=build_type=Release - cmake --preset=ci-ninja-release - cmake --build build --target SI_unit_benchmarks - ./build/test/SI_unit_benchmarks | tee ./build/benchmark_result.txt - - name: Store benchmark result - if: github.ref == 'refs/heads/main' - uses: rhysd/github-action-benchmark@v1.7.0 - with: - name: Catch2 Benchmark - tool: "catch2" - output-file-path: build/benchmark_result.txt - # Use personal access token instead of GITHUB_TOKEN due to https://github.community/t5/GitHub-Actions/Github-action-not-triggering-gh-pages-upon-push/td-p/26869/highlight/false - github-token: ${{ secrets.PERSONAL_GITHUB_TOKEN }} - auto-push: true - # Show alert with commit comment on detecting possible performance regression - alert-threshold: "200%" - comment-on-alert: true - fail-on-alert: true - alert-comment-cc-users: "@bernedom" - - name: Run benchmark - no store - if: github.ref != 'refs/heads/main' - uses: rhysd/github-action-benchmark@v1.7.0 - with: - name: Catch2 Benchmark - tool: "catch2" - output-file-path: build/benchmark_result.txt - # Use personal access token instead of GITHUB_TOKEN due to https://github.community/t5/GitHub-Actions/Github-action-not-triggering-gh-pages-upon-push/td-p/26869/highlight/false - github-token: ${{ secrets.PERSONAL_GITHUB_TOKEN }} - auto-push: false - # Show alert with commit comment on detecting possible performance regression - alert-threshold: "200%" - comment-on-alert: true - fail-on-alert: true - alert-comment-cc-users: "@bernedom" From de9286473bd46edec295dc6610dc1f49fab7ff46 Mon Sep 17 00:00:00 2001 From: Dominik Berner Date: Mon, 13 Nov 2023 21:07:16 +0100 Subject: [PATCH 3/3] Debug output for conan --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 13b00d01..20d684e8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -68,6 +68,7 @@ jobs: - name: conan-profile run: | + conan --version conan profile detect --force if [ "${{ matrix.compiler-name-conan }}" != "" ]; then sed -i.bak -e 's/compiler=.*/compiler=${{ matrix.compiler-name-conan }}/g' ~/.conan2/profiles/default @@ -78,6 +79,7 @@ jobs: if [ "${{ matrix.compiler-cppstd }}" != "" ]; then sed -i.bak -e 's/compiler.cppstd=gnu[0-9]\+/compiler.cppstd=${{ matrix.compiler-cppstd }}/g' ~/.conan2/profiles/default fi + cat ~/.conan2/profiles/default shell: bash - name: cmake-configure-debug