Skip to content

Commit 2304303

Browse files
authored
Merge branch 'v3.0' into v3.0-4951
Signed-off-by: René Cannaò <[email protected]>
2 parents 2763823 + dd847a1 commit 2304303

File tree

192 files changed

+23145
-5571
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

192 files changed

+23145
-5571
lines changed

.github/workflows/CI-3p-pgjdbc.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: CI-3p-pgjdbc
2+
run-name: '${{ github.event.workflow_run && github.event.workflow_run.head_branch || github.ref_name }} ${{ github.workflow }} ${{ github.event.workflow_run && github.event.workflow_run.head_sha || github.sha }}'
3+
4+
on:
5+
workflow_dispatch:
6+
inputs:
7+
testtree:
8+
description: 'proxysql_3p_testing treeish/branch/tag/hash'
9+
default: main
10+
type: string
11+
workflow_run:
12+
workflows: [ CI-trigger ]
13+
types: [ completed ]
14+
15+
concurrency:
16+
group: ${{ github.workflow }}-${{ github.event.workflow_run && github.event.workflow_run.head_branch || github.ref_name }}
17+
cancel-in-progress: true
18+
19+
jobs:
20+
run-pgsql:
21+
if: |
22+
(github.event.workflow_run && github.event.workflow_run.conclusion == 'success' || ! github.event.workflow_run) &&
23+
! startsWith((github.event.workflow_run && github.event.workflow_run.head_branch || github.ref_name), 'v2.')
24+
uses: sysown/proxysql/.github/workflows/ci-3p-pgjdbc.yml@GH-Actions
25+
secrets: inherit
26+
with:
27+
trigger: ${{ toJson(github) }}
28+
infradb: ${{ vars.MATRIX_3P_PGJDBC_infradb_pgsql }}
29+
connector: ${{ vars.MATRIX_3P_PGJDBC_connector_pgsql }}
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: CI-3p-php-pdo-pgsql
2+
run-name: '${{ github.event.workflow_run && github.event.workflow_run.head_branch || github.ref_name }} ${{ github.workflow }} ${{ github.event.workflow_run && github.event.workflow_run.head_sha || github.sha }}'
3+
4+
on:
5+
workflow_dispatch:
6+
inputs:
7+
testtree:
8+
description: 'proxysql_3p_testing treeish/branch/tag/hash'
9+
default: main
10+
type: string
11+
workflow_run:
12+
workflows: [ CI-trigger ]
13+
types: [ completed ]
14+
15+
concurrency:
16+
group: ${{ github.workflow }}-${{ github.event.workflow_run && github.event.workflow_run.head_branch || github.ref_name }}
17+
cancel-in-progress: true
18+
19+
jobs:
20+
run-pgsql:
21+
if: ${{ github.event.workflow_run && github.event.workflow_run.conclusion == 'success' || ! github.event.workflow_run }}
22+
uses: sysown/proxysql/.github/workflows/ci-3p-php-pdo-pgsql.yml@GH-Actions
23+
secrets: inherit
24+
with:
25+
trigger: ${{ toJson(github) }}
26+
infradb: ${{ vars.MATRIX_3P_PHP_PDO_PGSQL_infradb_pgsql }}
27+
connector: ${{ vars.MATRIX_3P_PHP_PDO_PGSQL_connector_pgsql }}

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ deps/re2/re2-*/
9696
deps/sqlite3/sqlite-amalgamation-*/
9797
deps/coredumper/coredumper-*/
9898
deps/postgresql/postgresql-*/
99+
deps/postgresql/postgres-*/
99100
deps/libusual/libusual-*/
100101

101102
test/.vagrant
@@ -150,3 +151,4 @@ proxysql-save.cfg
150151
test/tap/tests/test_cluster_sync_config/cluster_sync_node_stderr.txt
151152
test/tap/tests/test_cluster_sync_config/proxysql*.pem
152153
test/tap/tests/test_cluster_sync_config/test_cluster_sync.cnf
154+
GEMINI.md

0 commit comments

Comments
 (0)