Update c-ares from 1.19.1 to 1.26.0

gevent · Feb 13, 2024 · a0b3caf · a0b3caf
1 parent b00b4fb
commit a0b3caf
Show file tree

Hide file tree

Showing 214 changed files with 83,194 additions and 68,178 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -152,6 +152,10 @@ jobs:
       ###
       - name: Cache ~/.ccache
         uses: actions/cache@v4
+        # This is repeated in an explicit save always step below
+        # because normally it won't save anything if there's a cache hit!
+        # Which is silly, because things in the cache might have (will have)
+        # been changed.
         with:
           path: ~/.ccache/**
           key: ${{ runner.os }}-ccache2-${{ matrix.python-version }}
@@ -240,6 +244,12 @@ jobs:
         run: |
           ls -l dist
           twine check dist/*whl
+      - name: Cache ~/.ccache
+        uses: actions/cache/save@v4
+        if: always()
+        with:
+          path: ~/.ccache/**
+          key: ${{ runner.os }}-ccache2-${{ matrix.python-version }}
       - name: Upload gevent wheel
         uses: actions/upload-artifact@v4
         with:
@@ -270,8 +280,7 @@ jobs:
           echo CCache stats
           ccache --version
           ccache -s -v
-          echo CCache Dir
-          ls -l $CCACHE_DIR || true
+
 
       - name: "Tests: Basic"
         run: |
@@ -293,8 +302,8 @@ jobs:
         run: |
           python -m gevent.tests --second-chance $G_USE_COV `(cd src/gevent/tests >/dev/null && ls test__*subprocess*.py)`
       - name: "Tests: c-ares resolver"
-        # This sometimes fails on mac.
-        if: (matrix.python-version == '3.11.8') && startsWith(runner.os, 'Linux')
+        # This sometimes fails on mac. # && (matrix.python-version == '3.11.8')
+        if: startsWith(runner.os, 'Linux')
         env:
           GEVENT_RESOLVER: ares
         run: |

diff --git a/deps/README.rst b/deps/README.rst
@@ -47,6 +47,7 @@ Updating c-ares
     rm -f c-ares/CMakeLists.txt
     rm -f c-ares/RELEASE-PROCEDURE.md c-ares/CONTRIBUTING.md c-ares/SECURITY.md
     rm -f c-ares/*.cmake c-ares/*.cmake.in
+    rm -f c-ares/config/
     rm -f c-ares/buildconf.bat
     git apply cares-make.patch
 
@@ -63,7 +64,8 @@ Updating c-ares
   ``cares-make.patch``, or you'll get the diff of the patch itself in
   the diff!).
 
-- Follow the same 'config.guess' and 'config.sub' steps as libev.
+- Follow the same 'config.guess' and 'config.sub' steps as libev,
+  except the files belong in the ``config/`` subdir.
 
 
 Updating libuv