Merge pull request #813 from johnmcfarlane/ci-update

CI update

Author: johnmcfarlane

.github/deploy

@@ -61,6 +61,7 @@ popd
 
 # Upload new version of CNL Conan package to Bintray
 "${PROJECT_DIR}/test/scripts/conan-setup"
+conan remote add johnmcfarlane/cnl https://api.bintray.com/conan/johnmcfarlane/cnl
 conan user -p "${CONAN_PASS}" -r johnmcfarlane/cnl "${CONAN_USER}"
 conan install --build=missing "${PROJECT_DIR}"
 conan create "${PROJECT_DIR}" "cnl/${CNL_VERSION}@johnmcfarlane/${CNL_CHANNEL}"

.github/workflows/test.yml

@@ -183,7 +183,6 @@ jobs:
 
     - name: Initialise Conan
       run: |
-        conan remote add johnmcfarlane/cnl https://api.bintray.com/conan/johnmcfarlane/cnl && \
         conan profile new default --detect && \
         conan profile update settings.compiler=${{matrix.compiler}} default && \
         conan profile update settings.compiler.cppstd=${{matrix.std}} default && \
@@ -238,7 +237,6 @@ jobs:
     - name: Initialise Conan
       run: |
         pip.exe install conan;
-        conan remote add johnmcfarlane/cnl https://api.bintray.com/conan/johnmcfarlane/cnl;
         conan profile new default;
         conan profile update settings.compiler="Visual Studio" default;
         conan profile update settings.os=Windows default;

README.md

@@ -65,7 +65,6 @@ Optional integration tests use Boost.Multiprecision and Boost.SIMD.
 1. Conan can be used to pull in essential dependencies:
 
    ```shell
-   conan remote add --force johnmcfarlane/cnl https://api.bintray.com/conan/johnmcfarlane/cnl
    conan profile new --detect --force default
    conan profile update settings.compiler.libcxx=libstdc++11 default
    conan install --build=missing ..

conanfile.py

@@ -23,10 +23,10 @@ class CnlConan(ConanFile):
                        "target": "test-unit"}
     generators = "cmake_find_package"
     no_copy_source = True
-    requires = "gtest/1.10.0","benchmark/1.5.0@johnmcfarlane/stable"
+    requires = "gtest/1.10.0", "benchmark/1.5.2"
 
     scm = {
-        "revision": "main",
+        "revision": "auto",
         "type": "git",
         "url": "https://github.com/johnmcfarlane/cnl.git",
     }

test/scripts/conan-setup

@@ -5,9 +5,6 @@
 
 set -euo pipefail
 
-conan remote add \
-  johnmcfarlane/cnl https://api.bintray.com/conan/johnmcfarlane/cnl
-
 conan profile new \
   --detect \
   default