make CI use classic autospell list for old clients

HerculesWS · May 30, 2024 · 77b8f27 · 77b8f27
1 parent fb17e11
commit 77b8f27
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 6 deletions.
diff --git a/.github/workflows/clang15_test.yml b/.github/workflows/clang15_test.yml
@@ -21,6 +21,13 @@ jobs:
         HTTPLIB: ["", "--with-http_parser=llhttp"]
         SANITIZER: ["--disable-manager", "--disable-manager --enable-sanitize=full"]
         PACKET_VERSION: ["--enable-packetver=20221024", "--enable-packetver=20130724"]
+        include:
+          # Empty CLASSIC_AUTOSPELL_LIST for every other flow
+          - CLASSIC_AUTOSPELL_LIST: ""
+          # Use "-DCLASSIC_AUTOSPELL_LIST" for 20130724 RE or we will get warnings due to the list being too small
+          - PACKET_VERSION: "--enable-packetver=20130724"
+            RENEWAL: ""
+            CLASSIC_AUTOSPELL_LIST: "-DCLASSIC_AUTOSPELL_LIST"
         exclude:
           - PACKET_VERSION: "--enable-packetver=20130724"
             CLIENT_TYPE: "--enable-packetver-zero"
@@ -52,7 +59,7 @@ jobs:
       INSTALL_PACKAGES: ${{ matrix.CC }} mariadb-client libmariadbclient-dev-compat
       SQLHOST: mariadb
       CC: ${{ matrix.CC }}
-      CONFIGURE_FLAGS: CC=${{ matrix.CC }} --enable-debug --enable-Werror --enable-buildbot ${{ matrix.RENEWAL }} ${{ matrix.HTTPLIB }} ${{ matrix.CLIENT_TYPE }} ${{ matrix.SANITIZER }} ${{ matrix.PACKET_VERSION }}
+      CONFIGURE_FLAGS: CC=${{ matrix.CC }} --enable-debug --enable-Werror --enable-buildbot ${{ matrix.RENEWAL }} ${{ matrix.HTTPLIB }} ${{ matrix.CLIENT_TYPE }} ${{ matrix.SANITIZER }} ${{ matrix.PACKET_VERSION }} CPPFLAGS=${{ matrix.CLASSIC_AUTOSPELL_LIST }}
       PACKET_VERSION: ${{ matrix.PACKET_VERSION }}
     steps:
       - uses: actions/checkout@v1

diff --git a/.github/workflows/gcc_test.yml b/.github/workflows/gcc_test.yml
@@ -21,6 +21,13 @@ jobs:
         HTTPLIB: ["", "--with-http_parser=llhttp"]
         SANITIZER: ["--disable-manager", "--disable-manager --enable-sanitize=full"]
         PACKET_VERSION: ["--enable-packetver=20221024", "--enable-packetver=20130724"]
+        include:
+          # Empty CLASSIC_AUTOSPELL_LIST for every other flow
+          - CLASSIC_AUTOSPELL_LIST: ""
+          # Use "-DCLASSIC_AUTOSPELL_LIST" for 20130724 RE or we will get warnings due to the list being too small
+          - PACKET_VERSION: "--enable-packetver=20130724"
+            RENEWAL: ""
+            CLASSIC_AUTOSPELL_LIST: "-DCLASSIC_AUTOSPELL_LIST"
         exclude:
           - PACKET_VERSION: "--enable-packetver=20130724"
             CLIENT_TYPE: "--enable-packetver-zero"
@@ -52,7 +59,7 @@ jobs:
       INSTALL_PACKAGES: ${{ matrix.CC }} mariadb-client libmariadbclient-dev-compat
       SQLHOST: mariadb
       CC: ${{ matrix.CC }}
-      CONFIGURE_FLAGS: CC=${{ matrix.CC }} --enable-debug --enable-Werror --enable-buildbot ${{ matrix.RENEWAL }} ${{ matrix.HTTPLIB }} ${{ matrix.CLIENT_TYPE }} ${{ matrix.SANITIZER }} ${{ matrix.PACKET_VERSION }} --enable-lto
+      CONFIGURE_FLAGS: CC=${{ matrix.CC }} --enable-debug --enable-Werror --enable-buildbot ${{ matrix.RENEWAL }} ${{ matrix.HTTPLIB }} ${{ matrix.CLIENT_TYPE }} ${{ matrix.SANITIZER }} ${{ matrix.PACKET_VERSION }} --enable-lto CPPFLAGS=${{ matrix.CLASSIC_AUTOSPELL_LIST }}
       PACKET_VERSION: ${{ matrix.PACKET_VERSION }}
     steps:
       - uses: actions/checkout@v1

diff --git a/.github/workflows/gccold1.yml b/.github/workflows/gccold1.yml
@@ -22,6 +22,9 @@ jobs:
         SANITIZER: ["--disable-manager --enable-sanitize=full"]
         PACKET_VERSION: ["--enable-packetver=20100105", "--enable-packetver=20171018"]
         LTO: [""]
+        include:
+          # Use "-DCLASSIC_AUTOSPELL_LIST" for all packetver or we will get warnings due to the list being too small (since they are old)
+          - CLASSIC_AUTOSPELL_LIST: "-DCLASSIC_AUTOSPELL_LIST"
         exclude:
           - PACKET_VERSION: "--enable-packetver=20100105"
             CLIENT_TYPE: "--enable-packetver-zero"
@@ -53,7 +56,7 @@ jobs:
       INSTALL_PACKAGES: ${{ matrix.CC }} mariadb-client libmariadbclient-dev-compat
       SQLHOST: mariadb
       CC: ${{ matrix.CC }}
-      CONFIGURE_FLAGS: CC=${{ matrix.CC }} --enable-debug --enable-Werror --enable-buildbot ${{ matrix.RENEWAL }} ${{ matrix.HTTPLIB }} ${{ matrix.CLIENT_TYPE }} ${{ matrix.SANITIZER }} ${{ matrix.PACKET_VERSION }} --enable-epoll
+      CONFIGURE_FLAGS: CC=${{ matrix.CC }} --enable-debug --enable-Werror --enable-buildbot ${{ matrix.RENEWAL }} ${{ matrix.HTTPLIB }} ${{ matrix.CLIENT_TYPE }} ${{ matrix.SANITIZER }} ${{ matrix.PACKET_VERSION }} --enable-epoll CPPFLAGS=${{ matrix.CLASSIC_AUTOSPELL_LIST }}
     steps:
       - uses: actions/checkout@v1
         with:

diff --git a/.github/workflows/gccold2.yml b/.github/workflows/gccold2.yml
@@ -22,6 +22,9 @@ jobs:
         SANITIZER: ["--disable-manager --enable-sanitize=full"]
         PACKET_VERSION: ["--enable-packetver=20100105", "--enable-packetver=20171018"]
         LTO: [""]
+        include:
+          # Use "-DCLASSIC_AUTOSPELL_LIST" for all packetver or we will get warnings due to the list being too small (since they are old)
+          - CLASSIC_AUTOSPELL_LIST: "-DCLASSIC_AUTOSPELL_LIST"
         exclude:
           - PACKET_VERSION: "--enable-packetver=20100105"
             CLIENT_TYPE: "--enable-packetver-zero"
@@ -53,7 +56,7 @@ jobs:
       INSTALL_PACKAGES: ${{ matrix.CC }} mariadb-client libmariadbclient-dev-compat
       SQLHOST: mariadb
       CC: ${{ matrix.CC }}
-      CONFIGURE_FLAGS: CC=${{ matrix.CC }} --enable-debug --enable-Werror --enable-buildbot ${{ matrix.RENEWAL }} ${{ matrix.HTTPLIB }} ${{ matrix.CLIENT_TYPE }} ${{ matrix.SANITIZER }} ${{ matrix.PACKET_VERSION }} --enable-epoll
+      CONFIGURE_FLAGS: CC=${{ matrix.CC }} --enable-debug --enable-Werror --enable-buildbot ${{ matrix.RENEWAL }} ${{ matrix.HTTPLIB }} ${{ matrix.CLIENT_TYPE }} ${{ matrix.SANITIZER }} ${{ matrix.PACKET_VERSION }} --enable-epoll CPPFLAGS=${{ matrix.CLASSIC_AUTOSPELL_LIST }}
     steps:
       - uses: actions/checkout@v1
         with:

diff --git a/.github/workflows/gccold3.yml b/.github/workflows/gccold3.yml
@@ -23,6 +23,9 @@ jobs:
         SANITIZER: ["--disable-manager --enable-sanitize=full"]
         PACKET_VERSION: ["--enable-packetver=20100105", "--enable-packetver=20171018"]
         LTO: [""]
+        include:
+          # Use "-DCLASSIC_AUTOSPELL_LIST" for all packetver or we will get warnings due to the list being too small (since they are old)
+          - CLASSIC_AUTOSPELL_LIST: "-DCLASSIC_AUTOSPELL_LIST"
         exclude:
           - PACKET_VERSION: "--enable-packetver=20100105"
             CLIENT_TYPE: "--enable-packetver-zero"
@@ -54,7 +57,7 @@ jobs:
       INSTALL_PACKAGES: ${{ matrix.CC }} mariadb-client libmariadbclient-dev-compat
       SQLHOST: mariadb
       CC: ${{ matrix.CC }}
-      CONFIGURE_FLAGS: CC=${{ matrix.CC }} --enable-debug --enable-Werror --enable-buildbot ${{ matrix.RENEWAL }} ${{ matrix.HTTPLIB }} ${{ matrix.CLIENT_TYPE }} ${{ matrix.SANITIZER }} ${{ matrix.PACKET_VERSION }} --enable-epoll
+      CONFIGURE_FLAGS: CC=${{ matrix.CC }} --enable-debug --enable-Werror --enable-buildbot ${{ matrix.RENEWAL }} ${{ matrix.HTTPLIB }} ${{ matrix.CLIENT_TYPE }} ${{ matrix.SANITIZER }} ${{ matrix.PACKET_VERSION }} --enable-epoll CPPFLAGS=${{ matrix.CLASSIC_AUTOSPELL_LIST }}
     steps:
       - uses: actions/checkout@v1
         with:

diff --git a/.github/workflows/gccsnapshot_test.yml b/.github/workflows/gccsnapshot_test.yml
@@ -21,6 +21,13 @@ jobs:
         HTTPLIB: ["", "--with-http_parser=llhttp"]
         SANITIZER: ["--disable-manager", "--disable-manager --enable-sanitize=full"]
         PACKET_VERSION: ["--enable-packetver=20221024", "--enable-packetver=20130724"]
+        include:
+          # Empty CLASSIC_AUTOSPELL_LIST for every other flow
+          - CLASSIC_AUTOSPELL_LIST: ""
+          # Use "-DCLASSIC_AUTOSPELL_LIST" for 20130724 RE or we will get warnings due to the list being too small
+          - PACKET_VERSION: "--enable-packetver=20130724"
+            RENEWAL: ""
+            CLASSIC_AUTOSPELL_LIST: "-DCLASSIC_AUTOSPELL_LIST"
         exclude:
           - PACKET_VERSION: "--enable-packetver=20130724"
             CLIENT_TYPE: "--enable-packetver-zero"
@@ -52,7 +59,7 @@ jobs:
       INSTALL_PACKAGES: ${{ matrix.CC }} mariadb-client libmariadbclient-dev-compat
       SQLHOST: mariadb
       CC: ${{ matrix.CC }}
-      CONFIGURE_FLAGS: CC=${{ matrix.CC }} --enable-debug --enable-Werror --enable-buildbot ${{ matrix.RENEWAL }} ${{ matrix.HTTPLIB }} ${{ matrix.CLIENT_TYPE }} ${{ matrix.SANITIZER }} ${{ matrix.PACKET_VERSION }} --enable-lto
+      CONFIGURE_FLAGS: CC=${{ matrix.CC }} --enable-debug --enable-Werror --enable-buildbot ${{ matrix.RENEWAL }} ${{ matrix.HTTPLIB }} ${{ matrix.CLIENT_TYPE }} ${{ matrix.SANITIZER }} ${{ matrix.PACKET_VERSION }} --enable-lto CPPFLAGS=${{ matrix.CLASSIC_AUTOSPELL_LIST }}
       PACKET_VERSION: ${{ matrix.PACKET_VERSION }}
     steps:
       - uses: actions/checkout@v1