Merge branch 'v2.x' into v2.x_update_mariadb_connector_to_3.3.8

sysown · Dec 27, 2023 · 91fda88 · 91fda88
2 parents 0267ee4 + c41331a
commit 91fda88
Show file tree

Hide file tree

Showing 171 changed files with 1,439 additions and 921 deletions.
diff --git a/.github/workflows/CI-3p-mariadb-connector-c.yml b/.github/workflows/CI-3p-mariadb-connector-c.yml
@@ -0,0 +1,31 @@
+name: CI-3p-mariadb-connector-c
+
+on:
+  push:
+    branches: [ "v2.x" ]
+    paths-ignore:
+    - '.github/**'
+    - '**.md'
+  pull_request:
+    branches: [ "v2.x" ]
+    paths-ignore:
+    - '.github/**'
+    - '**.md'
+#  schedule:
+#    - cron: '15 13 * * 3'
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref_name }}
+
+jobs:
+  cache:
+    uses: sysown/proxysql/.github/workflows/ci-builds.yml@GH-Actions
+    secrets: inherit
+
+  run:
+    if: ${{ always() }}
+    needs: [ "cache" ]
+    uses: sysown/proxysql/.github/workflows/ci-3p-mariadb-connector-c.yml@GH-Actions
+    secrets: inherit
+
diff --git a/.github/workflows/CI-3p-mysql-connector-j.yml b/.github/workflows/CI-3p-mysql-connector-j.yml
@@ -24,6 +24,7 @@ jobs:
     secrets: inherit
 
   run:
+    if: ${{ always() }}
     needs: [ "cache" ]
     uses: sysown/proxysql/.github/workflows/ci-3p-mysql-connector-j.yml@GH-Actions
     secrets: inherit

diff --git a/.github/workflows/CI-3p-php-pdo-mysql.yml b/.github/workflows/CI-3p-php-pdo-mysql.yml
@@ -18,13 +18,13 @@ on:
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref_name }}
 
-
 jobs:
   cache:
     uses: sysown/proxysql/.github/workflows/ci-builds.yml@GH-Actions
     secrets: inherit
 
   run:
+    if: ${{ always() }}
     needs: [ "cache" ]
     uses: sysown/proxysql/.github/workflows/ci-3p-php-pdo-mysql.yml@GH-Actions
     secrets: inherit

diff --git a/.github/workflows/CI-3p-sqlalchemy.yml b/.github/workflows/CI-3p-sqlalchemy.yml
@@ -24,6 +24,7 @@ jobs:
     secrets: inherit
 
   run:
+    if: ${{ always() }}
     needs: [ "cache" ]
     uses: sysown/proxysql/.github/workflows/ci-3p-sqlalchemy.yml@GH-Actions
     secrets: inherit

diff --git a/.github/workflows/CI-basictests.yml b/.github/workflows/CI-basictests.yml
@@ -14,10 +14,6 @@ on:
 #  schedule:
 #    - cron: '15 13 * * 3'
   workflow_dispatch:
-#  workflow_run:
-#    workflows: ["CI-builds"]
-#    types: 
-#      - completed
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref_name }}
@@ -28,6 +24,7 @@ jobs:
     secrets: inherit
 
   run:
+    if: ${{ always() }}
     needs: [ "cache" ]
     uses: sysown/proxysql/.github/workflows/ci-basictests.yml@GH-Actions
     secrets: inherit

diff --git a/.github/workflows/CI-cb_taptests.yml b/.github/workflows/CI-cb_taptests.yml
diff --git a/.github/workflows/CI-repltests.yml b/.github/workflows/CI-repltests.yml
@@ -24,6 +24,7 @@ jobs:
     secrets: inherit
 
   run:
+    if: ${{ always() }}
     needs: [ "cache" ]
     uses: sysown/proxysql/.github/workflows/ci-repltests.yml@GH-Actions
     secrets: inherit

diff --git a/.github/workflows/CI-selftests.yml b/.github/workflows/CI-selftests.yml
@@ -24,6 +24,7 @@ jobs:
     secrets: inherit
 
   run:
+    if: ${{ always() }}
     needs: [ "cache" ]
     uses: sysown/proxysql/.github/workflows/ci-selftests.yml@GH-Actions
     secrets: inherit

diff --git a/.github/workflows/CI-shuntest.yml b/.github/workflows/CI-shuntest.yml
@@ -24,6 +24,7 @@ jobs:
     secrets: inherit
 
   run:
+    if: ${{ always() }}
     needs: [ "cache" ]
     uses: sysown/proxysql/.github/workflows/ci-shuntest.yml@GH-Actions
     secrets: inherit

diff --git a/.github/workflows/CI-taptests-groups.yml b/.github/workflows/CI-taptests-groups.yml
@@ -24,6 +24,7 @@ jobs:
     secrets: inherit
 
   run:
+    if: ${{ always() }}
     needs: [ "cache" ]
     uses: sysown/proxysql/.github/workflows/ci-taptests-groups.yml@GH-Actions
     secrets: inherit

diff --git a/.github/workflows/CI-taptests-ssl.yml b/.github/workflows/CI-taptests-ssl.yml
@@ -24,6 +24,7 @@ jobs:
     secrets: inherit
 
   run:
+    if: ${{ always() }}
     needs: [ "cache" ]
     uses: sysown/proxysql/.github/workflows/ci-taptests-ssl.yml@GH-Actions
     secrets: inherit

diff --git a/.github/workflows/CI-taptests.yml b/.github/workflows/CI-taptests.yml
@@ -24,6 +24,7 @@ jobs:
     secrets: inherit
 
   run:
+    if: ${{ always() }}
     needs: [ "cache" ]
     uses: sysown/proxysql/.github/workflows/ci-taptests.yml@GH-Actions
     secrets: inherit

diff --git a/.gitignore b/.gitignore
@@ -110,6 +110,10 @@ heaptrack.*
 #vscode
 .vscode/
 
+# test deps
+test/deps/mariadb-connector-c/mariadb-connector-c-*/
+test/deps/mysql-connector-c/mysql-5.7.*/
+
 #tap tests
 test/tap/tap/cpp-dotenv/cpp-dotenv-*
 test/tap/tap/cpp-dotenv/static/cpp-dotenv-*