Skip to content

Commit 17eaaca

Browse files
committed
[skip ci] Fix workflow file
1 parent c357672 commit 17eaaca

File tree

1 file changed

+42
-34
lines changed

1 file changed

+42
-34
lines changed

.github/workflows/permission-check.yaml

Lines changed: 42 additions & 34 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
@@ -438,7 +445,7 @@ jobs:
438445
uses: gradle/actions/setup-gradle@v4
439446

440447
- name: Execute Gradle 'integrationTestJdbcPermission' task
441-
run: ./gradlew integrationTestJdbcPermission -Dscalardb.jdbc.url=jdbc:oracle:thin:@//localhost:1521/ORCLPDB1 -Dscalardb.jdbc.username=SYSTEM -Dscalardb.jdbc.password=Oracle
448+
run: ./gradlew integrationTestJdbcPermission -Dscalardb.jdbc.url=jdbc:oracle:thin:@//localhost:1521/XEPDB1 -Dscalardb.jdbc.username=SYSTEM -Dscalardb.jdbc.password=Oracle
442449

443450
- name: Upload Gradle test reports
444451
if: always()
@@ -451,15 +458,6 @@ jobs:
451458
name: Oracle 23 Permission Integration Test
452459
runs-on: ubuntu-latest
453460

454-
services:
455-
oracle:
456-
image: ghcr.io/scalar-labs/oracle/db-prebuilt:23
457-
credentials:
458-
username: ${{ github.repository_owner }}
459-
password: ${{ secrets.CR_PAT }}
460-
ports:
461-
- 1521:1521
462-
463461
steps:
464462
- name: Free up ~14GB of disk space by removing the Android SDK
465463
run: |
@@ -502,7 +500,11 @@ jobs:
502500
uses: gradle/actions/setup-gradle@v4
503501

504502
- 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
503+
run: ./gradlew integrationTestJdbcPermission -Dscalardb.jdbc.url=jdbc:oracle:thin:@//localhost:1521/FREEPDB1 -Dscalardb.jdbc.username=SYSTEM -Dscalardb.jdbc.password=Oracle
504+
505+
- name: Stop Oracle 23 container
506+
if: always()
507+
run: docker stop oracle-23 | xargs docker rm
506508

507509
- name: Upload Gradle test reports
508510
if: always()
@@ -513,7 +515,7 @@ jobs:
513515

514516
integration-test-permission-jdbc-sqlserver-2017:
515517
name: SQL Server 2017 Permission Integration Test
516-
runs-on: ubuntu-latest
518+
runs-on: windows-latest
517519

518520
steps:
519521
- uses: actions/checkout@v4
@@ -535,7 +537,7 @@ jobs:
535537
uses: gradle/actions/setup-gradle@v4
536538

537539
- name: Execute Gradle 'integrationTestJdbcPermission' task
538-
run: ./gradlew integrationTestJdbcPermission -Dscalardb.jdbc.url=jdbc:sqlserver://localhost:1433;encrypt=false -Dscalardb.jdbc.username=sa -Dscalardb.jdbc.password=SqlServer17
540+
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"
539541

540542
- name: Upload Gradle test reports
541543
if: always()
@@ -548,16 +550,20 @@ jobs:
548550
name: SQL Server 2019 Permission Integration Test
549551
runs-on: ubuntu-latest
550552

553+
services:
554+
sqlserver:
555+
image: mcr.microsoft.com/mssql/server:2019-latest
556+
env:
557+
MSSQL_PID: "Express"
558+
SA_PASSWORD: "SqlServer19"
559+
ACCEPT_EULA: "Y"
560+
ports:
561+
- 1433:1433
562+
options: --name sqlserver19
563+
551564
steps:
552565
- uses: actions/checkout@v4
553566

554-
- name: Setup Sql Server 2019
555-
uses: rails-sqlserver/setup-mssql@v1
556-
with:
557-
components: sqlcmd,sqlengine
558-
sa-password: "SqlServer19"
559-
version: 2019
560-
561567
- name: Set up JDK ${{ env.JAVA_VERSION }} (${{ env.JAVA_VENDOR }})
562568
uses: actions/setup-java@v4
563569
with:
@@ -568,7 +574,7 @@ jobs:
568574
uses: gradle/actions/setup-gradle@v4
569575

570576
- name: Execute Gradle 'integrationTestJdbcPermission' task
571-
run: ./gradlew integrationTestJdbcPermission -Dscalardb.jdbc.url=jdbc:sqlserver://localhost:1433;encrypt=false -Dscalardb.jdbc.username=sa -Dscalardb.jdbc.password=SqlServer19
577+
run: ./gradlew integrationTestJdbcPermission "-Dscalardb.jdbc.url=jdbc:sqlserver://localhost:1433;encrypt=true;trustServerCertificate=true" "-Dscalardb.jdbc.username=sa" "-Dscalardb.jdbc.password=SqlServer19"
572578

573579
- name: Upload Gradle test reports
574580
if: always()
@@ -581,16 +587,20 @@ jobs:
581587
name: SQL Server 2022 Permission Integration Test
582588
runs-on: ubuntu-latest
583589

590+
services:
591+
sqlserver:
592+
image: mcr.microsoft.com/mssql/server:2022-latest
593+
env:
594+
MSSQL_PID: "Express"
595+
SA_PASSWORD: "SqlServer22"
596+
ACCEPT_EULA: "Y"
597+
ports:
598+
- 1433:1433
599+
options: --name sqlserver22
600+
584601
steps:
585602
- uses: actions/checkout@v4
586603

587-
- name: Setup Sql Server 2022
588-
uses: rails-sqlserver/setup-mssql@v1
589-
with:
590-
components: sqlcmd,sqlengine
591-
sa-password: "SqlServer22"
592-
version: 2022
593-
594604
- name: Set up JDK ${{ env.JAVA_VERSION }} (${{ env.JAVA_VENDOR }})
595605
uses: actions/setup-java@v4
596606
with:
@@ -601,13 +611,11 @@ jobs:
601611
uses: gradle/actions/setup-gradle@v4
602612

603613
- name: Execute Gradle 'integrationTestJdbcPermission' task
604-
run: ./gradlew integrationTestJdbcPermission -Dscalardb.jdbc.url=jdbc:sqlserver://localhost:1433;encrypt=false -Dscalardb.jdbc.username=sa -Dscalardb.jdbc.password=SqlServer22
614+
run: ./gradlew integrationTestJdbcPermission "-Dscalardb.jdbc.url=jdbc:sqlserver://localhost:1433;encrypt=true;trustServerCertificate=true" "-Dscalardb.jdbc.username=sa" "-Dscalardb.jdbc.password=SqlServer22"
605615

606616
- name: Upload Gradle test reports
607617
if: always()
608618
uses: actions/upload-artifact@v4
609619
with:
610620
name: sqlserver_2022_permission_integration_test_reports
611621
path: core/build/reports/tests/integrationTestJdbcPermission
612-
613-

0 commit comments

Comments
 (0)