Skip to content

Commit 3b3623c

Browse files
committed
[misc] use DOCKER_LOGIN as user if secret available
1 parent 60498bb commit 3b3623c

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ jobs:
6969
test-db-database: ${{ env.MYSQL_TEST_DB }}
7070
test-db-port: ${{ env.MYSQL_TEST_PORT }}
7171
additional-conf: ${{ matrix.additional-conf || '' }}
72-
registry-user: ${{ matrix.db-type == 'enterprise' && secrets.ENTERPRISE_USER || (secrets.DOCKER_PWD != '' && 'mariadbtest' || '') }}
73-
registry-password: ${{ matrix.db-type == 'enterprise' && secrets.ENTERPRISE_TOKEN || secrets.DOCKER_PWD }}
72+
registry-user: ${{ matrix.db-type == 'enterprise' && secrets.ENTERPRISE_USER || (secrets.DOCKER_TOKEN != '' && secrets.DOCKER_LOGIN || '') }}
73+
registry-password: ${{ matrix.db-type == 'enterprise' && secrets.ENTERPRISE_TOKEN || secrets.DOCKER_TOKEN }}
7474
os: ${{ matrix.os }}
7575

7676
- name: make ubuntu

0 commit comments

Comments
 (0)