Merge branch 'release-0.12.0'

k-nuth · Apr 13, 2021 · 5057faf · 5057faf
2 parents d37e194 + 6945240
commit 5057faf
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 13 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -66,7 +66,7 @@ test_script:
         conan user
 
         $ErrorActionPreference = 'SilentlyContinue'
-        conan remote add kth_temp https://api.bintray.com/conan/k-nuth/kth
+        conan remote add kth_temp https://knuth.jfrog.io/artifactory/api/conan/knuth
         $ErrorActionPreference = 'Continue'
 
         # python ci_utils/wait_for_deps.py domain
@@ -79,7 +79,7 @@ test_script:
       Invoke-Expression $a
 
       $ErrorActionPreference = 'SilentlyContinue'
-      conan remote add kth https://api.bintray.com/conan/k-nuth/kth
+      conan remote add kth https://knuth.jfrog.io/artifactory/api/conan/knuth
       $ErrorActionPreference = 'Continue'
 
       # conan info . --only None

diff --git a/.github/workflows/knuth.yml b/.github/workflows/knuth.yml
@@ -57,7 +57,7 @@ jobs:
         run: |
           conan user
           conan remote list
-          conan remote add kthbuild_kth_temp_ https://api.bintray.com/conan/k-nuth/kth || true
+          conan remote add kthbuild_kth_temp_ https://knuth.jfrog.io/artifactory/api/conan/knuth || true
           conan remote list
           # echo "KTH_REPO_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $1}')" >> $GITHUB_ENV
           export KTH_REPO_NAME=$(echo '${{ github.repository }}')
@@ -131,7 +131,7 @@ jobs:
           python.exe --version
           cmake --version
           python.exe -m pip install --upgrade pip
-          pip.exe install conan_package_tools==0.35.0
+          pip.exe install conan_package_tools==0.35.1
           pip.exe install kthbuild --upgrade
           conan user
         shell: cmd
@@ -163,6 +163,11 @@ jobs:
         env:
           CONAN_LOGIN_USERNAME: ${{ secrets.CONAN_LOGIN_USERNAME }}
           CONAN_PASSWORD: ${{ secrets.CONAN_PASSWORD }}
+          CONAN_LOGIN_USERNAME_UPLOAD_REPO: ${{ secrets.CONAN_LOGIN_USERNAME_UPLOAD_REPO }}
+          CONAN_PASSWORD_UPLOAD_REPO: ${{ secrets.CONAN_PASSWORD_UPLOAD_REPO }}
+          CONAN_LOGIN_USERNAME_TAO: ${{ secrets.CONAN_LOGIN_USERNAME_TAO }}
+          CONAN_PASSWORD_TAO: ${{ secrets.CONAN_PASSWORD_TAO }}
+
           CONAN_STABLE_BRANCH_PATTERN: "master$" #"release/*"
         shell: bash
         run: |
@@ -173,6 +178,9 @@ jobs:
           echo ${CONAN_APPLE_CLANG_VERSIONS}
           echo ${CONAN_DOCKER_IMAGE}
           echo ${CONAN_LOGIN_USERNAME}
+          echo ${CONAN_LOGIN_USERNAME_UPLOAD_REPO}
+          echo ${CONAN_LOGIN_USERNAME_TAO}
+          echo ${CONAN_DOCKER_ENTRY_SCRIPT}
 
           export KTH_BRANCH=$(echo '${{ github.ref }}' | awk -F '/' '{print $3}')
           echo "My branch name is $KTH_BRANCH"
@@ -185,6 +193,11 @@ jobs:
         env:
           CONAN_LOGIN_USERNAME: ${{ secrets.CONAN_LOGIN_USERNAME }}
           CONAN_PASSWORD: ${{ secrets.CONAN_PASSWORD }}
+          CONAN_LOGIN_USERNAME_UPLOAD_REPO: ${{ secrets.CONAN_LOGIN_USERNAME_UPLOAD_REPO }}
+          CONAN_PASSWORD_UPLOAD_REPO: ${{ secrets.CONAN_PASSWORD_UPLOAD_REPO }}
+          CONAN_LOGIN_USERNAME_TAO: ${{ secrets.CONAN_LOGIN_USERNAME_TAO }}
+          CONAN_PASSWORD_TAO: ${{ secrets.CONAN_PASSWORD_TAO }}
+
           CONAN_STABLE_BRANCH_PATTERN: "master$" #"release/*"
         shell: powershell
         run: |
@@ -204,7 +217,7 @@ jobs:
           Invoke-Expression $a
 
           $ErrorActionPreference = 'SilentlyContinue'
-          conan remote add kth https://api.bintray.com/conan/k-nuth/kth
+          conan remote add kth https://knuth.jfrog.io/artifactory/api/conan/knuth
           $ErrorActionPreference = 'Continue'
 
           # conan info . --only None
@@ -261,6 +274,10 @@ jobs:
         env:
           CONAN_LOGIN_USERNAME: ${{ secrets.CONAN_LOGIN_USERNAME }}
           CONAN_PASSWORD: ${{ secrets.CONAN_PASSWORD }}
+          CONAN_LOGIN_USERNAME_UPLOAD_REPO: ${{ secrets.CONAN_LOGIN_USERNAME_UPLOAD_REPO }}
+          CONAN_PASSWORD_UPLOAD_REPO: ${{ secrets.CONAN_PASSWORD_UPLOAD_REPO }}
+          CONAN_LOGIN_USERNAME_TAO: ${{ secrets.CONAN_LOGIN_USERNAME_TAO }}
+          CONAN_PASSWORD_TAO: ${{ secrets.CONAN_PASSWORD_TAO }}
         shell: bash
         run: |
 
@@ -272,7 +289,7 @@ jobs:
           echo "My branch name is $KTH_BRANCH"
 
           eval $(python ci_utils/set_envvars_and_files.py)
-          # conan remote add kthbuild_kth_temp_ https://api.bintray.com/conan/k-nuth/kth
+          # conan remote add kthbuild_kth_temp_ https://knuth.jfrog.io/artifactory/api/conan/knuth
           conan user
           conan user ${CONAN_LOGIN_USERNAME} -r kthbuild_kth_temp_ -p ${CONAN_PASSWORD}
           conan user

diff --git a/README.md b/README.md
@@ -13,13 +13,13 @@ Installing the library is as simple as:
 ```
 $ pip install kthbuild --user --upgrade
 
-$ conan remote add kth https://api.bintray.com/conan/k-nuth/kth
+$ conan remote add kth https://knuth.jfrog.io/artifactory/api/conan/knuth
 ```
 
 2. Install the appropriate library:
 
 ```
-$ conan install database/0.X@kth/stable 
+$ conan install database/0.X@kth/stable
 ```
 
 For more more detailed instructions, please refer to our [documentation](https://kth.cash/docs/).

diff --git a/ci_utils b/ci_utils
diff --git a/conanfile.py b/conanfile.py
@@ -48,9 +48,9 @@ def recipe_dir(self):
         "tests": False,
         "tools": False,
         "currency": "BCH",
-        "microarchitecture": "_DUMMY_", 
+        "microarchitecture": "_DUMMY_",
         "fix_march": False,
-        "march_id": "_DUMMY_", 
+        "march_id": "_DUMMY_",
         "verbose": False,
         "measurements": False,
         "db": "default",
@@ -86,7 +86,7 @@ def requirements(self):
             self.output.info("Using legacy DB")
 
         if self.options.tests:
-            self.requires("catch2/2.13.1@")
+            self.requires("catch2/2.13.4")
 
         self.requires("domain/0.X@%s/%s" % (self.user, self.channel))
 
@@ -98,7 +98,7 @@ def configure(self):
 
         self.options["*"].cached_rpc_data = self.options.cached_rpc_data
         self.options["*"].measurements = self.options.measurements
-        
+
         self.options["*"].db_readonly = self.options.db_readonly
         self.output.info("Compiling with read-only DB: %s" % (self.options.db_readonly,))