Merge branch 'zeromq:master' into master

.github/workflows/CI.yaml

@@ -25,23 +25,20 @@ jobs:
             ENABLE_DRAFTS: ON
           - os: ubuntu-latest
             BUILD_TYPE: default
-            PACKAGES: asciidoc xmlto
-            CURVE: tweetnacl
+            PACKAGES: asciidoctor
             DRAFT: disabled
             POLLER: select
           - os: ubuntu-latest
             BUILD_TYPE: default
-            CURVE: tweetnacl
             DRAFT: disabled
             POLLER: poll
           - os: ubuntu-latest
             BUILD_TYPE: android
-            CURVE: tweetnacl
+            NDK_VERSION: android-ndk-r25
             DRAFT: disabled
           - os: ubuntu-latest
             BUILD_TYPE: coverage
             PACKAGES: libkrb5-dev libnorm-dev libpgm-dev libgnutls28-dev lcov
-            CURVE: tweetnacl
             DRAFT: enabled
             GSSAPI: enabled
             PGM: enabled
@@ -52,14 +49,20 @@ jobs:
           - os: ubuntu-latest
             BUILD_TYPE: valgrind
             PACKAGES: valgrind libgnutls28-dev
-            CURVE: tweetnacl
             DRAFT: enabled
           - os: ubuntu-latest
             BUILD_TYPE: cmake
             CURVE: libsodium
             DRAFT: enabled
             PACKAGES: cmake libsodium-dev
             TLS: enabled
+          - os: ubuntu-latest
+            BUILD_TYPE: cmake
+            CURVE: libsodium
+            DRAFT: enabled
+            GSSAPI: enabled
+            PACKAGES: cmake libsodium-dev libkrb5-dev
+            TLS: enabled
           - os: ubuntu-latest
             BUILD_TYPE: cmake
             DRAFT: enabled
@@ -102,22 +105,19 @@ jobs:
           - os: ubuntu-latest
             BUILD_TYPE: abi-compliance-checker
             PACKAGES: abi-dumper abi-compliance-checker
-            CURVE: tweetnacl
             DRAFT: disabled
           - os: ubuntu-latest
             BUILD_TYPE: cmake
             PACKAGES: clang-tidy clang-tools
-            CURVE: tweetnacl
             DRAFT: enabled
             CXX: clang++
           - os: macos-latest
             BUILD_TYPE: default
-            PACKAGES: automake autoconf
-            CURVE: tweetnacl
+            PACKAGES: automake autoconf libtool
             DRAFT: enabled
           - os: macos-latest
             BUILD_TYPE: default
-            PACKAGES: automake autoconf libsodium
+            PACKAGES: automake autoconf libtool libsodium
             CURVE: libsodium
             DRAFT: disabled
     env:
@@ -149,6 +149,8 @@ jobs:
       USE_NSS: ${{ matrix.USE_NSS }}
       VMCI: ${{ matrix.VMCI }}
       POLLER: ${{ matrix.POLLER }}
+      NDK_VERSION: ${{ matrix.NDK_VERSION }}
+      ANDROID_NDK_ROOT: /tmp/${{ matrix.NDK_VERSION }}
     steps:    
     - name: Add msbuild to PATH
       uses: microsoft/[email protected]

.github/workflows/Docs.yaml

@@ -0,0 +1,50 @@
+# Simple workflow for deploying static content to GitHub Pages
+name: Deploy API docs content to Pages
+
+on:
+  # Runs on pushes targeting the default branch
+  push:
+    branches: ["master"]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
+# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
+jobs:
+  # Single deploy job since we're just deploying
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      ## libzmq-specific CI/CD ##
+      - name: Install AsciiDoctor
+        run: sudo apt install -y asciidoctor
+      - name: Convert AsciiDoc with AsciiDoctor into HTML
+        run: ./autogen.sh && ./configure && make --directory=doc
+
+      ## boilerplate steps to publish github Pages ##
+      - name: Setup Pages
+        uses: actions/configure-pages@v3
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v2
+        with:
+          path: 'doc/'
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v2

.gitignore

@@ -6,6 +6,7 @@ syntax: glob # for hg-git users
 builds/Makefile
 builds/deprecated-msvc/Makefile
 doc/Makefile
+doc/__pagelist
 libtool
 ### automake
 Makefile.in

.obs/workflows.yml

@@ -4,6 +4,16 @@ workflow:
         source_project: network:messaging:zeromq:git-draft
         source_package: libzmq
         target_project: network:messaging:zeromq:ci
+rebuild:
+  steps:
+    - trigger_services:
+        project: network:messaging:zeromq:git-stable
+        package: libzmq
+    - trigger_services:
+        project: network:messaging:zeromq:git-draft
+        package: libzmq
+  filters:
+    event: push
 release:
   steps:
     - trigger_services:

.readthedocs.yaml

@@ -0,0 +1,38 @@
+#
+# libzmq readthedocs.io integration
+#
+# This configuration file is processed by readthedocs.io to rebuild the
+# libzmq documentation using Asciidoctor, see
+#   https://docs.readthedocs.io/en/stable/build-customization.html#asciidoc
+
+version: "2"
+
+formats:
+  - htmlzip
+
+build:
+  os: "ubuntu-22.04"
+  tools:
+    nodejs: "20"
+  # NOTE: as of Nov 2023, build.apt_packages is NOT considered when using build.commands
+  #apt_packages:
+  #  - automake
+  #  - autoconf
+  #  - cmake
+  #  - libtool
+  commands:
+    # install required tools
+    - npm install -g asciidoctor
+
+    # HTML docs
+    # ---------
+    - doc/create_page_list.sh "$(pwd)/doc/__pagelist" "$(pwd)/doc"
+    - asciidoctor --backend html --destination-dir $READTHEDOCS_OUTPUT/html --attribute stylesheet=asciidoctor.css --attribute zmq_version='4.3.6' --attribute zmq_pagelist_dir=$(pwd)/doc doc/*.adoc
+
+    # HTMLZIP docs
+    # ------------
+    # Note that for usability we make sure zip will create a zipfile containing just a flat list of HTML files; 
+    # to achieve that it's important to avoid storing absolute paths when invoking "zip", thus we use -j
+    # Also note that the archive name should match exactly the project slug, "libzmq" in this case.
+    - mkdir -p $READTHEDOCS_OUTPUT/htmlzip/
+    - cd $READTHEDOCS_OUTPUT/html && zip -j ../htmlzip/libzmq.zip *.html

AUTHORS

@@ -27,6 +27,7 @@ Bernd Prager
 Bob Beaty
 Brandon Carpenter
 Brett Cameron
+Brett Viren
 Brian Buchanan
 Burak Arslan
 Carl Clemens
@@ -69,7 +70,6 @@ Jon Dyte
 Kamil Shakirov
 Ken Steele
 Kouhei Sutou
-Laurent Alebarde
 Leonardo J. Consoni
 Lionel Flandrin
 Lourens Naudé
@@ -120,6 +120,7 @@ Toralf Wittner
 Tore Halvorsen
 Trevor Bernard
 Vitaly Mayatskikh
+Yacheng Zhou
 
 Credits
 =======