diff --git a/deps/nats.c/.github/ISSUE_TEMPLATE/config.yml b/deps/nats.c/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 0000000..c6c4224 --- /dev/null +++ b/deps/nats.c/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,8 @@ +blank_issues_enabled: false +contact_links: + - name: Discussion + url: https://github.com/nats-io/nats.c/discussions + about: Ideal for ideas, feedback, or longer form questions. + - name: Chat + url: https://slack.nats.io + about: Ideal for short, one-off questions, general conversation, and meeting other NATS users! diff --git a/deps/nats.c/.github/ISSUE_TEMPLATE/defect.yml b/deps/nats.c/.github/ISSUE_TEMPLATE/defect.yml new file mode 100644 index 0000000..99b4800 --- /dev/null +++ b/deps/nats.c/.github/ISSUE_TEMPLATE/defect.yml @@ -0,0 +1,41 @@ +--- +name: Defect +description: Report a defect, such as a bug or regression. +labels: + - defect +body: + - type: textarea + id: versions + attributes: + label: What version were you using? + description: Include the server version (`nats-server --version`) and any client versions when observing the issue. + validations: + required: true + - type: textarea + id: environment + attributes: + label: What environment was the server running in? + description: This pertains to the operating system, CPU architecture, and/or Docker image that was used. + validations: + required: true + - type: textarea + id: steps + attributes: + label: Is this defect reproducible? + description: Provide best-effort steps to showcase the defect. + validations: + required: true + - type: textarea + id: expected + attributes: + label: Given the capability you are leveraging, describe your expectation? + description: This may be the expected behavior or performance characteristics. + validations: + required: true + - type: textarea + id: actual + attributes: + label: Given the expectation, what is the defect you are observing? + description: This may be an unexpected behavior or regression in performance. + validations: + required: true diff --git a/deps/nats.c/.github/ISSUE_TEMPLATE/proposal.yml b/deps/nats.c/.github/ISSUE_TEMPLATE/proposal.yml new file mode 100644 index 0000000..d7da0ca --- /dev/null +++ b/deps/nats.c/.github/ISSUE_TEMPLATE/proposal.yml @@ -0,0 +1,34 @@ +--- +name: Proposal +description: Propose an enhancement or new feature. +labels: + - proposal +body: + - type: textarea + id: usecase + attributes: + label: What motivated this proposal? + description: Describe the use case justifying this request. + validations: + required: true + - type: textarea + id: change + attributes: + label: What is the proposed change? + description: This could be a behavior change, enhanced API, or a branch new feature. + validations: + required: true + - type: textarea + id: benefits + attributes: + label: Who benefits from this change? + description: Describe how this not only benefits you. + validations: + required: false + - type: textarea + id: alternates + attributes: + label: What alternatives have you evaluated? + description: This could be using existing features or relying on an external dependency. + validations: + required: false diff --git a/deps/nats.c/.gitignore b/deps/nats.c/.gitignore index f452f0d..fdedaff 100644 --- a/deps/nats.c/.gitignore +++ b/deps/nats.c/.gitignore @@ -10,6 +10,8 @@ cmake-build*/ install/ html/ !doc/html/ +test/datastore_*/ +test/conf_* # Emacs *~ diff --git a/deps/nats.c/.gitrepo b/deps/nats.c/.gitrepo index 3ba9c21..3fe6bed 100644 --- a/deps/nats.c/.gitrepo +++ b/deps/nats.c/.gitrepo @@ -5,8 +5,8 @@ ; [subrepo] remote = https://github.com/nats-io/nats.c.git - branch = v3.6.1 - commit = 66cec7fce9a64f911015f0c516a086c1a74cd22a - parent = 5bc936a09f065123793cfc741a08d2129f691d48 + branch = v3.7.0 + commit = 5d057f66f897279975f1c8eb61c1ccaaf1a7ae01 + parent = 136ef10775a087317c20d6c78fbb6f5c072d1308 method = merge cmdver = 0.4.6 diff --git a/deps/nats.c/.travis.yml b/deps/nats.c/.travis.yml index 2bfb188..999d017 100644 --- a/deps/nats.c/.travis.yml +++ b/deps/nats.c/.travis.yml @@ -1,5 +1,5 @@ language: cpp -dist: bionic +dist: focal os: linux cache: @@ -25,6 +25,34 @@ env: jobs: include: + - name: "NATS server - latest release" + compiler: gcc + addons: + apt: + sources: + - ubuntu-toolchain-r-test + - sourceline: ppa:ubuntu-toolchain-r/test + packages: + - g++-9 + env: + - NATS_TEST_SERVER_VERSION=latest + - MATRIX_EVAL="CC=gcc-9" + - BUILD_OPT="-DNATS_BUILD_ARCH=64 -DCMAKE_BUILD_TYPE=Release" DO_COVERAGE="no" + + - name: "NATS server - main" + compiler: gcc + addons: + apt: + sources: + - ubuntu-toolchain-r-test + - sourceline: ppa:ubuntu-toolchain-r/test + packages: + - g++-9 + env: + - NATS_TEST_SERVER_VERSION=main + - MATRIX_EVAL="CC=gcc-9" + - BUILD_OPT="-DNATS_BUILD_ARCH=64 -DCMAKE_BUILD_TYPE=Release" DO_COVERAGE="no" + - name: "gcc-9 - TLS OFF" compiler: gcc addons: @@ -62,7 +90,7 @@ jobs: - g++-9 env: - MATRIX_EVAL="CC=gcc-9" - - BUILD_OPT="-DNATS_BUILD_ARCH=64 -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS=-fsanitize=address" NATS_TEST_VALGRIND=yes DO_COVERAGE="no" + - BUILD_OPT="-DNATS_BUILD_ARCH=64 -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS=-fsanitize=address" NATS_TEST_VALGRIND=yes DO_COVERAGE="no" - name: "gcc-9 - Lib msg delivery - sanitize address" compiler: gcc @@ -75,7 +103,7 @@ jobs: - g++-9 env: - MATRIX_EVAL="CC=gcc-9" - - NATS_DEFAULT_TO_LIB_MSG_DELIVERY=yes BUILD_OPT="-DNATS_BUILD_ARCH=64 -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS=-fsanitize=address" NATS_TEST_VALGRIND=yes DO_COVERAGE="no" + - NATS_DEFAULT_TO_LIB_MSG_DELIVERY=yes BUILD_OPT="-DNATS_BUILD_ARCH=64 -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS=-fsanitize=address" NATS_TEST_VALGRIND=yes DO_COVERAGE="no" - name: "gcc-9 - Write deadline - sanitize address" compiler: gcc @@ -101,7 +129,7 @@ jobs: - g++-9 env: - MATRIX_EVAL="CC=gcc-9" - - BUILD_OPT="-DNATS_BUILD_ARCH=64 -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS=-fsanitize=thread" DO_COVERAGE="no" + - BUILD_OPT="-DNATS_BUILD_ARCH=64 -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS=-fsanitize=thread" NATS_TEST_VALGRIND=yes DO_COVERAGE="no" - name: "clang-8 - TLS OFF" compiler: clang diff --git a/deps/nats.c/CMakeLists.txt b/deps/nats.c/CMakeLists.txt index d2a5d22..a3d7ff6 100644 --- a/deps/nats.c/CMakeLists.txt +++ b/deps/nats.c/CMakeLists.txt @@ -236,11 +236,11 @@ endif(NATS_BUILD_WITH_TLS) # Versionning and Doc set(NATS_VERSION_MAJOR 3) -set(NATS_VERSION_MINOR 6) -set(NATS_VERSION_PATCH 1) +set(NATS_VERSION_MINOR 7) +set(NATS_VERSION_PATCH 0) set(NATS_VERSION_SUFFIX "") -set(NATS_VERSION_REQUIRED_NUMBER 0x030600) +set(NATS_VERSION_REQUIRED_NUMBER 0x030700) if(NATS_UPDATE_VERSION OR NATS_UPDATE_DOC) configure_file( diff --git a/deps/nats.c/README.md b/deps/nats.c/README.md index a236102..c96fd8a 100644 --- a/deps/nats.c/README.md +++ b/deps/nats.c/README.md @@ -9,7 +9,7 @@ This NATS Client implementation is heavily based on the [NATS GO Client](https:/ [](https://www.apache.org/licenses/LICENSE-2.0) [](https://travis-ci.com/github/nats-io/nats.c) [](https://coveralls.io/github/nats-io/nats.c?branch=main) -[](https://github.com/nats-io/nats.c/releases/tag/v3.6.1) +[](https://github.com/nats-io/nats.c/releases/tag/v3.7.0) [](http://nats-io.github.io/nats.c) # Table of Contents diff --git a/deps/nats.c/buildOnTravis.sh b/deps/nats.c/buildOnTravis.sh index afe4912..fbfe5e2 100755 --- a/deps/nats.c/buildOnTravis.sh +++ b/deps/nats.c/buildOnTravis.sh @@ -10,6 +10,23 @@ echo "coverage = " $2 echo "build opts = " $3 echo "test opts = " $4 +if [ "$NATS_TEST_SERVER_VERSION" != "" ]; then + rel=$NATS_TEST_SERVER_VERSION + mkdir -p $HOME/nats-server-$rel + if [ "$rel" = "latest" ]; then + rel=$(curl -s https://api.github.com/repos/nats-io/nats-server/releases/latest | jq -r '.tag_name') + fi + + if [ "$rel" != "${rel#v}" ] && wget https://github.com/nats-io/nats-server/releases/download/$rel/nats-server-$rel-linux-amd64.tar.gz; then + tar -xzf nats-server-$rel-linux-amd64.tar.gz + mv nats-server-$rel-linux-amd64 $HOME/nats-server-$rel + else + curl -sf "https://binaries.nats.dev/nats-io/nats-server/v2@$rel" | PREFIX=. sh + mv nats-server $HOME/nats-server-$rel + fi + PATH=$HOME/nats-server-$rel:$PATH +fi + if [ "$1" != "gcc" ]; then if [ "$2" = "coverage" ]; then # only coverage for gcc compiler @@ -35,8 +52,10 @@ res=$? if [ $res -ne 0 ]; then exit $res fi -export NATS_TEST_SERVER_VERSION="$(nats-server -v)" + export NATS_TEST_TRAVIS=yes +export NATS_TEST_SERVER_VERSION="$(nats-server -v)" +echo "Using NATS server version: $NATS_TEST_SERVER_VERSION" ctest --timeout 60 --output-on-failure $4 res=$? if [ $res -ne 0 ]; then diff --git a/deps/nats.c/doc/DoxyFile.NATS.Client b/deps/nats.c/doc/DoxyFile.NATS.Client index f8dd88b..e562556 100644 --- a/deps/nats.c/doc/DoxyFile.NATS.Client +++ b/deps/nats.c/doc/DoxyFile.NATS.Client @@ -48,7 +48,7 @@ PROJECT_NAME = NATS C Client with JetStream and Streaming support # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 3.6.1 +PROJECT_NUMBER = 3.7.0 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/deps/nats.c/doc/html/annotated.html b/deps/nats.c/doc/html/annotated.html index 8f689aa..819944b 100644 --- a/deps/nats.c/doc/html/annotated.html +++ b/deps/nats.c/doc/html/annotated.html @@ -4,7 +4,7 @@
- +
+ NATS C Client with JetStream and Streaming support
+ 3.7.0
+
+ The nats.io C Client, Supported by Synadia Communications Inc.
+ |
+