From ec004280c835f2d184aae2b158a81f6905345101 Mon Sep 17 00:00:00 2001 From: Fernando Pelliccioni Date: Tue, 6 Apr 2021 17:33:43 -0300 Subject: [PATCH 1/3] name fix --- src/parser.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/parser.cpp b/src/parser.cpp index a692107d..94e92c9d 100644 --- 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(&configured.network.blacklists), + value(&configured.network.blacklist), "IP address to disallow as a peer, multiple entries allowed." )( "network.peer", From 7beef823261464e1908617be495a725bc19158bd Mon Sep 17 00:00:00 2001 From: Fernando Pelliccioni Date: Tue, 6 Apr 2021 17:46:51 -0300 Subject: [PATCH 2/3] update CPT to v0.35.0 --- .appveyor.yml | 8 ++++---- .github/workflows/knuth.yml | 22 +++++++++++----------- ci_utils | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 953f78a0..3f68821c 100644 --- 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 index 448ff2de..1e8db2c1 100644 --- 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 index 6d4edeba..fe28d82c 160000 --- a/ci_utils +++ b/ci_utils @@ -1 +1 @@ -Subproject commit 6d4edebac08be0689c19ff3c47278cc110f7b936 +Subproject commit fe28d82cbdcc208f94e13d7ab6e7c976aa506893 From 3f6de0e601254842fca50bba73702a778909e2cf Mon Sep 17 00:00:00 2001 From: Fernando Pelliccioni Date: Tue, 6 Apr 2021 19:23:50 -0300 Subject: [PATCH 3/3] force CI