diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml index 71776d99..00243896 100644 --- a/.github/workflows/ci-conan.yml +++ b/.github/workflows/ci-conan.yml @@ -20,7 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -name: mp-units Conan CI +name: Conan CI on: push: @@ -48,13 +48,13 @@ jobs: - name: Install Conan run: | pip install -U conan_package_tools - - name: Run + - name: Run conan-package-tools env: - CONAN_USERNAME: ${{ secrets.CONAN_USERNAME }} + CONAN_USERNAME: mpusz + CONAN_OPTIONS: mp-units:build_docs=False + CONAN_UPLOAD: https://api.bintray.com/conan/mpusz/conan-mpusz CONAN_LOGIN_USERNAME: ${{ secrets.CONAN_LOGIN_USERNAME }} CONAN_PASSWORD: ${{ secrets.CONAN_PASSWORD }} - CONAN_UPLOAD: ${{ secrets.CONAN_UPLOAD }} - CONAN_OPTIONS: mp-units:build_docs=False CONAN_CMAKE_GENERATOR: Ninja CONAN_DOCKER_IMAGE: conanio/${{ matrix.compiler.name }}${{ matrix.compiler.version }} run: | diff --git a/.github/workflows/ci-test-package-cmake.yml b/.github/workflows/ci-test-package-cmake.yml index d9056c82..ded7ef34 100644 --- a/.github/workflows/ci-test-package-cmake.yml +++ b/.github/workflows/ci-test-package-cmake.yml @@ -73,7 +73,7 @@ jobs: - name: Configure Conan run: | conan config init - conan remote add upload ${{ secrets.CONAN_UPLOAD }} + conan remote add upload https://api.bintray.com/conan/mpusz/conan-mpusz - name: Install Conan dependencies run: | mkdir -p build/${{ matrix.build_type }} && cd build/${{ matrix.build_type }} diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 0963c3f0..f6370e88 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -85,7 +85,7 @@ jobs: run: | pip install -U conan conan config init - conan remote add upload ${{ secrets.CONAN_UPLOAD }} + conan remote add upload https://api.bintray.com/conan/mpusz/conan-mpusz 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 dd2292fb..b901d329 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 upload ${{ secrets.CONAN_UPLOAD }} + conan remote add upload https://api.bintray.com/conan/mpusz/conan-mpusz conan remote add linear-algebra https://api.bintray.com/conan/twonington/public-conan - name: Install Conan dependencies run: | diff --git a/build.py b/build.py index 2a957bec..f7c0efc5 100644 --- a/build.py +++ b/build.py @@ -22,9 +22,9 @@ # The following environment variables are required # - CONAN_USERNAME +# - CONAN_UPLOAD # - CONAN_LOGIN_USERNAME # - CONAN_PASSWORD -# - CONAN_UPLOAD from cpt.packager import ConanMultiPackager