Skip to content

Commit 7623745

Browse files
committed
[misc] use docker registry of set
1 parent 069b958 commit 7623745

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ env:
2020
TEST_DB_USER: root
2121
TEST_DB_PASSWORD: "heyPassw-!*20oRd"
2222
TEST_DB_DATABASE: testn
23-
2423
jobs:
2524
setup:
2625
runs-on: ubuntu-latest
@@ -31,8 +30,6 @@ jobs:
3130
- id: set-matrix
3231
name: build matrix
3332
uses: rusher/mariadb-test-build-matrix@main
34-
with:
35-
additional-matrix: '[{"name": "MariaDB 11.4", "os": "ubuntu-latest", "db-type": "community", "db-tag": "11.4", "node": 24}, {"name": "MariaDB 11.4", "os": "ubuntu-latest", "db-type": "community", "db-tag": "11.4", "node": 20}]'
3633

3734
ci:
3835
name: ${{ matrix.name }}${{ matrix.node != 22 && format(' - node {0}', matrix.node) || '' }}
@@ -57,8 +54,8 @@ jobs:
5754
test-db-database: ${{ env.TEST_DB_DATABASE }}
5855
test-db-port: ${{ env.TEST_DB_PORT }}
5956
additional-conf: ${{ matrix.additional-conf || '' }}
60-
registry-user: ${{ matrix.db-type == 'enterprise' && secrets.ENTERPRISE_USER || '' }}
61-
registry-password: ${{ matrix.db-type == 'enterprise' && secrets.ENTERPRISE_TOKEN || '' }}
57+
registry-user: ${{ matrix.db-type == 'enterprise' && secrets.ENTERPRISE_USER || (secrets.DOCKER_PWD != '' && 'mariadbtest' || '') }}
58+
registry-password: ${{ matrix.db-type == 'enterprise' && secrets.ENTERPRISE_TOKEN || secrets.DOCKER_PWD }}
6259
os: ${{ matrix.os }}
6360

6461
- uses: actions/setup-node@v4

0 commit comments

Comments
 (0)