Skip to content

Commit 3ff259e

Browse files
committed
[skip ci] Fix workflow file
1 parent 2f9de1e commit 3ff259e

File tree

1 file changed

+18
-9
lines changed

1 file changed

+18
-9
lines changed

.github/workflows/permission-check.yaml

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ jobs:
135135
uses: gradle/actions/setup-gradle@v4
136136

137137
- name: Execute Gradle 'integrationTestJdbcPermission' task
138-
run: ./gradlew integrationTestJdbcPermission
138+
run: ./gradlew integrationTestJdbcPermission -Dscalardb.jdbc.url=jdbc:mysql://localhost:3306/ -Dscalardb.jdbc.username=root -Dscalardb.jdbc.password=mysql
139139

140140
- name: Upload Gradle test reports
141141
if: always()
@@ -164,7 +164,7 @@ jobs:
164164
uses: gradle/actions/setup-gradle@v4
165165

166166
- name: Execute Gradle 'integrationTestJdbcPermission' task
167-
run: ./gradlew integrationTestJdbcPermission
167+
run: ./gradlew integrationTestJdbcPermission -Dscalardb.jdbc.url=jdbc:mysql://localhost:3306/ -Dscalardb.jdbc.username=root -Dscalardb.jdbc.password=mysql
168168

169169
- name: Upload Gradle test reports
170170
if: always()
@@ -193,7 +193,7 @@ jobs:
193193
uses: gradle/actions/setup-gradle@v4
194194

195195
- name: Execute Gradle 'integrationTestJdbcPermission' task
196-
run: ./gradlew integrationTestJdbcPermission
196+
run: ./gradlew integrationTestJdbcPermission -Dscalardb.jdbc.url=jdbc:mysql://localhost:3306/ -Dscalardb.jdbc.username=root -Dscalardb.jdbc.password=mysql
197197

198198
- name: Upload Gradle test reports
199199
if: always()
@@ -422,8 +422,15 @@ jobs:
422422
credentials:
423423
username: ${{ github.repository_owner }}
424424
password: ${{ secrets.CR_PAT }}
425+
env:
426+
ORACLE_PWD: Oracle
425427
ports:
426428
- 1521:1521
429+
options: >-
430+
--health-cmd "/opt/oracle/checkDBStatus.sh"
431+
--health-interval 10s
432+
--health-timeout 5s
433+
--health-retries 120
427434
428435
steps:
429436
- uses: actions/checkout@v4
@@ -502,7 +509,11 @@ jobs:
502509
uses: gradle/actions/setup-gradle@v4
503510

504511
- name: Execute Gradle 'integrationTestJdbcPermission' task
505-
run: ./gradlew integrationTestJdbcPermission -Dscalardb.jdbc.url=jdbc:oracle:thin:@//localhost:1521/ORCLPDB1 -Dscalardb.jdbc.username=SYSTEM -Dscalardb.jdbc.password=Oracle
512+
run: ./gradlew integrationTestJdbcPermission -Dscalardb.jdbc.url=jdbc:oracle:thin:@//localhost:1521/FREEPDB1 -Dscalardb.jdbc.username=SYSTEM -Dscalardb.jdbc.password=Oracle
513+
514+
- name: Stop Oracle 23 container
515+
if: always()
516+
run: docker stop oracle-23 | xargs docker rm
506517

507518
- name: Upload Gradle test reports
508519
if: always()
@@ -535,7 +546,7 @@ jobs:
535546
uses: gradle/actions/setup-gradle@v4
536547

537548
- name: Execute Gradle 'integrationTestJdbcPermission' task
538-
run: ./gradlew integrationTestJdbcPermission -Dscalardb.jdbc.url=jdbc:sqlserver://localhost:1433;encrypt=true;trustServerCertificate=true -Dscalardb.jdbc.username=sa -Dscalardb.jdbc.password=SqlServer17 -Dfile.encoding=UTF-8
549+
run: ./gradlew integrationTestJdbcPermission "-Dscalardb.jdbc.url=jdbc:sqlserver://localhost:1433;encrypt=true;trustServerCertificate=true" "-Dscalardb.jdbc.username=sa" "-Dscalardb.jdbc.password=SqlServer17" "-Dfile.encoding=UTF-8"
539550

540551
- name: Upload Gradle test reports
541552
if: always()
@@ -572,7 +583,7 @@ jobs:
572583
uses: gradle/actions/setup-gradle@v4
573584

574585
- name: Execute Gradle 'integrationTestJdbcPermission' task
575-
run: ./gradlew integrationTestJdbcPermission -Dscalardb.jdbc.url=jdbc:sqlserver://localhost:1433;encrypt=true;trustServerCertificate=true -Dscalardb.jdbc.username=sa -Dscalardb.jdbc.password=SqlServer19
586+
run: ./gradlew integrationTestJdbcPermission "-Dscalardb.jdbc.url=jdbc:sqlserver://localhost:1433;encrypt=true;trustServerCertificate=true" "-Dscalardb.jdbc.username=sa" "-Dscalardb.jdbc.password=SqlServer19"
576587

577588
- name: Upload Gradle test reports
578589
if: always()
@@ -609,13 +620,11 @@ jobs:
609620
uses: gradle/actions/setup-gradle@v4
610621

611622
- name: Execute Gradle 'integrationTestJdbcPermission' task
612-
run: ./gradlew integrationTestJdbcPermission -Dscalardb.jdbc.url=jdbc:sqlserver://localhost:1433;encrypt=true;trustServerCertificate=true -Dscalardb.jdbc.username=sa -Dscalardb.jdbc.password=SqlServer22
623+
run: ./gradlew integrationTestJdbcPermission "-Dscalardb.jdbc.url=jdbc:sqlserver://localhost:1433;encrypt=true;trustServerCertificate=true" "-Dscalardb.jdbc.username=sa" "-Dscalardb.jdbc.password=SqlServer22"
613624

614625
- name: Upload Gradle test reports
615626
if: always()
616627
uses: actions/upload-artifact@v4
617628
with:
618629
name: sqlserver_2022_permission_integration_test_reports
619630
path: core/build/reports/tests/integrationTestJdbcPermission
620-
621-

0 commit comments

Comments
 (0)