From a954f5d924b459398de74ab8f2336b5adc75697d Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Mon, 5 Apr 2021 17:19:14 +0200 Subject: [PATCH] build: Conan testing version is now hosted on Artifactory Bintray is going to be EOL soon --- .github/workflows/ci-conan.yml | 2 +- .github/workflows/ci-test-package-cmake.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/documentation.yml | 2 +- README.md | 10 +++++----- docs/CHANGELOG.md | 1 + docs/usage.rst | 4 ++-- 7 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml index 23b3189e..d93a3c5d 100644 --- a/.github/workflows/ci-conan.yml +++ b/.github/workflows/ci-conan.yml @@ -132,7 +132,7 @@ jobs: env: CONAN_USERNAME: mpusz CONAN_OPTIONS: mp-units:build_docs=False,mp-units:downcast_mode=${{ matrix.downcast_mode }} - CONAN_UPLOAD: https://api.bintray.com/conan/mpusz/conan-mpusz + CONAN_UPLOAD: https://mpusz.jfrog.io/artifactory/api/conan/conan-oss CONAN_LOGIN_USERNAME: ${{ secrets.CONAN_LOGIN_USERNAME }} CONAN_PASSWORD: ${{ secrets.CONAN_PASSWORD }} CONAN_CMAKE_GENERATOR: Ninja diff --git a/.github/workflows/ci-test-package-cmake.yml b/.github/workflows/ci-test-package-cmake.yml index a7382937..c2fcebcf 100644 --- a/.github/workflows/ci-test-package-cmake.yml +++ b/.github/workflows/ci-test-package-cmake.yml @@ -136,7 +136,7 @@ jobs: shell: bash run: | conan config init - conan remote add upload https://api.bintray.com/conan/mpusz/conan-mpusz + conan remote add upload https://mpusz.jfrog.io/artifactory/api/conan/conan-oss conan profile update settings.build_type=${{ matrix.build_type }} default conan profile update settings.compiler.cppstd=20 default if [[ "${{ matrix.config.compiler.type }}" == "GCC" || "${{ matrix.config.compiler.type }}" == "CLANG" ]]; then diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index e2de54de..478d0435 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -83,7 +83,7 @@ jobs: run: | pip install -U conan conan config init - conan remote add upload https://api.bintray.com/conan/mpusz/conan-mpusz + conan remote add upload https://mpusz.jfrog.io/artifactory/api/conan/conan-oss conan remote add linear-algebra https://api.bintray.com/conan/twonington/public-conan mkdir _lgtm_build_dir && cd _lgtm_build_dir conan install .. -s compiler.cppstd=20 -s compiler.libcxx=libstdc++11 -o mp-units:build_docs=False -e mp-units:CONAN_RUN_TESTS=True -b outdated -u diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 6c950d5a..1229e983 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -74,7 +74,7 @@ jobs: - name: Configure Conan run: | conan config init - conan remote add -i 0 upload https://api.bintray.com/conan/mpusz/conan-mpusz + conan remote add -i 0 upload https://mpusz.jfrog.io/artifactory/api/conan/conan-oss conan remote add linear-algebra https://api.bintray.com/conan/twonington/public-conan - name: Install Conan dependencies run: | diff --git a/README.md b/README.md index 41382b9e..225aea71 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ [![GitHub license](https://img.shields.io/github/license/mpusz/units?cacheSeconds=3600&color=informational&label=License)](./LICENSE.md) -[![Conan CI](https://img.shields.io/github/workflow/status/mpusz/units/Conan%20CI/master?label=Conan)](https://github.com/mpusz/units/actions?query=workflow%3A%22Conan%20CI%22+branch%3Amaster) -[![CMake CI](https://img.shields.io/github/workflow/status/mpusz/units/CMake%20Test%20Package%20CI/master?label=CMake)](https://github.com/mpusz/units/actions?query=workflow%3A%22CMake+Test+Package+CI%22+branch%3Amaster) -[![GitHub Workflow Documentation](https://img.shields.io/github/workflow/status/mpusz/units/Documentation/master?label=Documentation)](https://github.com/mpusz/units/actions?query=workflow%3ADocumentation+branch%3Amaster) -[![Conan stable](https://api.bintray.com/packages/mpusz/conan-mpusz/mp-units%3Ampusz/images/download.svg?version=0.6.0%3Astable)](https://bintray.com/mpusz/conan-mpusz/mp-units%3Ampusz/0.6.0%3Astable/link) -[![Conan testing](https://api.bintray.com/packages/mpusz/conan-mpusz/mp-units%3Ampusz/images/download.svg)](https://bintray.com/mpusz/conan-mpusz/mp-units%3Ampusz/_latestVersion) +[![Conan CI](https://img.shields.io/github/workflow/status/mpusz/units/Conan%20CI/master?label=Conan%20CI)](https://github.com/mpusz/units/actions?query=workflow%3A%22Conan%20CI%22+branch%3Amaster) +[![CMake CI](https://img.shields.io/github/workflow/status/mpusz/units/CMake%20Test%20Package%20CI/master?label=CMake%20CI)](https://github.com/mpusz/units/actions?query=workflow%3A%22CMake+Test+Package+CI%22+branch%3Amaster) +[![GitHub Workflow Documentation](https://img.shields.io/github/workflow/status/mpusz/units/Documentation/master?label=Documentation%20CI)](https://github.com/mpusz/units/actions?query=workflow%3ADocumentation+branch%3Amaster) +[![Conan stable](https://img.shields.io/badge/ConanCenter-0.6.0%3Astable-blue)](https://conan.io/center/mp-units) +[![Conan testing](https://img.shields.io/badge/mpusz.jfrog.io-0.7.0%3Atesting-blue)](https://mpusz.jfrog.io/ui/packages/conan:%2F%2Fmp-units/0.7.0) # `mp-units` - A Units Library for C++ diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 93b141c1..0de43e7a 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -29,6 +29,7 @@ - fix: ambiguous case for empty type list resolved - fix: downcasting facility for non-default-constructible types - fix: restore user-warnings within the library implementation + - (!) build: Conan testing version is now hosted on [Artifactory](https://mpusz.jfrog.io/ui/packages/conan:%2F%2Fmp-units) - (!) build: `BUILD_DOCS` CMake option renamed to `UNITS_BUILD_DOCS` - build: doxygen updated to 1.8.20 - build: catch2 updated to 2.13.4 diff --git a/docs/usage.rst b/docs/usage.rst index b8c1c951..cec3ccfe 100644 --- a/docs/usage.rst +++ b/docs/usage.rst @@ -325,7 +325,7 @@ differences: .. code-block:: shell - conan remote add conan-mpusz https://api.bintray.com/conan/mpusz/conan-mpusz + conan remote add conan-mpusz https://mpusz.jfrog.io/artifactory/api/conan/conan-oss 2. In your Conan configuration file provide package identifier of the ``mpusz/testing`` stream: @@ -343,7 +343,7 @@ differences: The identifiers of the latest packages can always be found in `the project's README file `_ or on - `the project's Bintray `_. + `the project's Artifactory `_. 3. Force Conan to check for updated recipes ``-u`` and to build outdated packages ``-b outdated``: