From: Terry Burton <tez@terryburton.co.uk>
Date: Sun, 14 Mar 2021 13:09:08 +0000 (+0000)
Subject: Minor CI improvements (#3980)
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9dff9bfdb7bd1b11144f7953085bd5c1efe0932e;p=thirdparty%2Ffreeradius-server.git

Minor CI improvements (#3980)

* Use pragmas not hacks to disable build warnings for homebrew libs

Current libjson-c no longer triggering errors.

talloc.h errors silenced by b65415f985bdb4a823afd5d7e1acac4de4314f0b

* CI package tests: Use Azure-hosted mirrors for better reliability
---

diff --git a/.github/workflows/ci-deb.yml b/.github/workflows/ci-deb.yml
index 6e55481c041..944896b27b6 100644
--- a/.github/workflows/ci-deb.yml
+++ b/.github/workflows/ci-deb.yml
@@ -36,8 +36,11 @@ jobs:
 
     - name: Package manager performance improvements
       run: |
+        sed -i 's/deb.debian.org/debian-archive.trafficmanager.net/' /etc/apt/sources.list
+        sed -i 's/archive.ubuntu.com/azure.archive.ubuntu.com/' /etc/apt/sources.list
         echo force-unsafe-io > /etc/dpkg/dpkg.cfg.d/02speedup
         echo 'man-db man-db/auto-update boolean false' | debconf-set-selections
+        apt-get update
 
     #
     #  Required so that the checkout action uses git protocol rather than the GitHub REST API.
@@ -45,7 +48,6 @@ jobs:
     #
     - name: Install recent git
       run: |
-        apt-get update
         apt-get install -y --no-install-recommends git-core ca-certificates
 
     - uses: actions/checkout@v2
@@ -147,12 +149,6 @@ jobs:
 
     steps:
 
-    # For pkill
-    - name: Install procps
-      run: |
-        apt-get update
-        apt-get install -y --no-install-recommends procps
-
     - name: Load DEBs
       uses: actions/download-artifact@v2
       with:
@@ -160,8 +156,16 @@ jobs:
 
     - name: Package manager performance improvements
       run: |
+        sed -i 's/deb.debian.org/debian-archive.trafficmanager.net/' /etc/apt/sources.list
+        sed -i 's/archive.ubuntu.com/azure.archive.ubuntu.com/' /etc/apt/sources.list
         echo force-unsafe-io > /etc/dpkg/dpkg.cfg.d/02speedup
         echo 'man-db man-db/auto-update boolean false' | debconf-set-selections
+        apt-get update
+
+    # For pkill
+    - name: Install procps
+      run: |
+        apt-get install -y --no-install-recommends procps
 
     - name: Install DEBs
       run: |
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5e00ce2ae39..3daeb7a0520 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -190,25 +190,6 @@ jobs:
         pcre-config --libs-posix --version 2>/dev/null || :
         pcre2-config --libs-posix --version 2>/dev/null || :
 
-    - name: Hacks to silence clang-12 warnings in talloc and json-c (MacOS)
-      if: ${{ runner.os == 'macOS' }}
-      run: |
-        sed -i '' '1i\
-        #pragma clang diagnostic ignored "-Wdocumentation"
-        ' /usr/local/include/talloc.h
-        sed -i '' '1i\
-        #pragma clang diagnostic ignored "-Wdocumentation-deprecated-sync"
-        ' /usr/local/include/json-c/json_tokener.h
-        sed -i '' '1i\
-        #pragma clang diagnostic ignored "-Wdocumentation-deprecated-sync"
-        ' /usr/local/include/json-c/arraylist.h
-        sed -i '' '1i\
-        #pragma clang diagnostic ignored "-Wdocumentation-deprecated-sync"
-        ' /usr/local/include/json-c/json_util.h
-        sed -i '' '1i\
-        #pragma clang diagnostic ignored "-Wstrict-prototypes"
-        ' /usr/local/include/cassandra.h
-
     - name: Configure
       run: |
         if $CC -v 2>&1 | grep clang > /dev/null; then
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_cassandra/rlm_sql_cassandra.c b/src/modules/rlm_sql/drivers/rlm_sql_cassandra/rlm_sql_cassandra.c
index 5c39f178b38..8cc494fe03f 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_cassandra/rlm_sql_cassandra.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_cassandra/rlm_sql_cassandra.c
@@ -38,7 +38,15 @@
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/util/debug.h>
 
+#ifdef HAVE_WDOCUMENTATION
+DIAG_OFF(documentation)
+#endif
+DIAG_OFF(strict-prototypes)  /* Seen with homebrew cassandra-cpp-driver 2.15.3 */
 #include <cassandra.h>
+DIAG_ON(strict-prototypes)
+#ifdef HAVE_WDOCUMENTATION
+DIAG_ON(documentation)
+#endif
 
 #include "rlm_sql.h"