Merge branch 'release-0.14.0'

k-nuth · Apr 6, 2021 · f4153e8 · f4153e8
2 parents 26ad956 + 3f6de0e
commit f4153e8
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -29,7 +29,7 @@ install:
   - set PATH=%PYTHON%;%PYTHON%/Scripts/;%PATH%;
   - python.exe --version
   - python.exe -m pip install --upgrade pip > NUL
-  - pip.exe install conan_package_tools==0.34.2 > NUL
+  - pip.exe install conan_package_tools==0.35.0 > NUL
   # - pip install kthbuild==0.0.14 > NUL
   - pip.exe install kthbuild --upgrade > NUL
   - conan user # It creates the conan data directory
@@ -47,7 +47,7 @@ test_script:
   # - git describe
   # - git describe master
   # - git describe origin
-  # - python ci_utils/print_version.py 
+  # - python ci_utils/print_version.py
 
   # - git config core.autocrlf
   # - python crlf.py
@@ -142,14 +142,14 @@ for:
         # - MINGW_CONFIGURATIONS: "7@x86_64@seh@posix"
         # - MINGW_CONFIGURATIONS: "6@x86_64@seh@posix"
         # - MINGW_CONFIGURATIONS: "5@x86_64@seh@posix"
-        # - MINGW_CONFIGURATIONS: "4.9@x86_64@seh@posix" 
+        # - MINGW_CONFIGURATIONS: "4.9@x86_64@seh@posix"
   -
     branches:
       only:
         - master
     test_script:
       - echo "Stable packages are published in Release branches"
-    install: 
+    install:
       - echo "Stable packages are published in Release branches"
 
 # matrix:

diff --git a/.github/workflows/knuth.yml b/.github/workflows/knuth.yml
@@ -15,7 +15,7 @@ jobs:
 
   wait-for-dependencies:
     name: Wait for dependencies (modules)
-    if: github.ref == 'refs/heads/dev' || 
+    if: github.ref == 'refs/heads/dev' ||
         startsWith(github.ref, 'refs/heads/testci') ||
         startsWith(github.ref, 'refs/heads/release') ||
         startsWith(github.ref, 'refs/heads/hotfix')
@@ -91,7 +91,7 @@ jobs:
           echo "::set-output name=matrix::${MATRIX}"
           # JSON=$(cat ./ci_utils/.github/matrix.json)
           # echo "::set-output name=${JSON//'%'/'%25'}"
-          
+
   builds:
     needs: generate-matrix
     runs-on: ${{ matrix.config.os }}
@@ -104,7 +104,7 @@ jobs:
         if: ${{ matrix.config.compiler == 'Visual Studio' }}
         run: |
           git config --global core.autocrlf false
-          git config --global core.eol lf          
+          git config --global core.eol lf
           # git config --global --edit
           # git config --global core.autocrlf true
           # git config --global --edit
@@ -116,7 +116,7 @@ jobs:
       - uses: actions/setup-python@v1
         with:
           python-version: "3.8"
-  
+
       - name: Install Dependencies (Unix)
         if: ${{ matrix.config.compiler != 'Visual Studio' }}
         run: |
@@ -131,7 +131,7 @@ jobs:
           python.exe --version
           cmake --version
           python.exe -m pip install --upgrade pip
-          pip.exe install conan_package_tools==0.34.2
+          pip.exe install conan_package_tools==0.35.0
           pip.exe install kthbuild --upgrade
           conan user
         shell: cmd
@@ -222,9 +222,9 @@ jobs:
   static-checks:
     needs: wait-for-dependencies
     name: Static Checks
-    if: github.ref == 'refs/heads/dev' || 
+    if: github.ref == 'refs/heads/dev' ||
         startsWith(github.ref, 'refs/heads/testci') ||
-        startsWith(github.ref, 'refs/heads/release') || 
+        startsWith(github.ref, 'refs/heads/release') ||
         startsWith(github.ref, 'refs/heads/hotfix')
 
     runs-on: ubuntu-20.04
@@ -237,11 +237,11 @@ jobs:
   upload-aliases:
     name: Upload Aliases
     needs: [builds, static-checks]
-    if: github.ref == 'refs/heads/dev' || 
+    if: github.ref == 'refs/heads/dev' ||
         startsWith(github.ref, 'refs/heads/testci') ||
-        startsWith(github.ref, 'refs/heads/release') || 
+        startsWith(github.ref, 'refs/heads/release') ||
         startsWith(github.ref, 'refs/heads/hotfix') ||
-        startsWith(github.ref, 'refs/heads/feature') 
+        startsWith(github.ref, 'refs/heads/feature')
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
@@ -279,7 +279,7 @@ jobs:
           echo "conan alias ${REPO_NAME}/0.X@kth/${KTH_CONAN_CHANNEL} ${REPO_NAME}/${KTH_CONAN_VERSION}@kth/${KTH_CONAN_CHANNEL}"
           conan alias "${REPO_NAME}/0.X@kth/${KTH_CONAN_CHANNEL}" "${REPO_NAME}/${KTH_CONAN_VERSION}@kth/${KTH_CONAN_CHANNEL}"
           echo "conan upload ${REPO_NAME}/0.X@kth/${KTH_CONAN_CHANNEL} --all -r kthbuild_kth_temp_"
-          conan upload "${REPO_NAME}/0.X@kth/${KTH_CONAN_CHANNEL}" --all -r kthbuild_kth_temp_        
+          conan upload "${REPO_NAME}/0.X@kth/${KTH_CONAN_CHANNEL}" --all -r kthbuild_kth_temp_
 
 
 

diff --git a/ci_utils b/ci_utils
diff --git a/src/parser.cpp b/src/parser.cpp
@@ -285,7 +285,7 @@ options_metadata parser::load_settings() {
         "The advertised public address of this node, defaults to none."
     )(
         "network.blacklist",
-        value<infrastructure::config::authority::list>(&configured.network.blacklists),
+        value<infrastructure::config::authority::list>(&configured.network.blacklist),
         "IP address to disallow as a peer, multiple entries allowed."
     )(
         "network.peer",