Skip to content

Commit 2f9de1e

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

File tree

1 file changed

+27
-19
lines changed

1 file changed

+27
-19
lines changed

.github/workflows/permission-check.yaml

Lines changed: 27 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ jobs:
438438
uses: gradle/actions/setup-gradle@v4
439439

440440
- 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
441+
run: ./gradlew integrationTestJdbcPermission -Dscalardb.jdbc.url=jdbc:oracle:thin:@//localhost:1521/XEPDB1 -Dscalardb.jdbc.username=SYSTEM -Dscalardb.jdbc.password=Oracle
442442

443443
- name: Upload Gradle test reports
444444
if: always()
@@ -513,7 +513,7 @@ jobs:
513513

514514
integration-test-permission-jdbc-sqlserver-2017:
515515
name: SQL Server 2017 Permission Integration Test
516-
runs-on: ubuntu-latest
516+
runs-on: windows-latest
517517

518518
steps:
519519
- uses: actions/checkout@v4
@@ -535,7 +535,7 @@ jobs:
535535
uses: gradle/actions/setup-gradle@v4
536536

537537
- 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
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
539539

540540
- name: Upload Gradle test reports
541541
if: always()
@@ -548,16 +548,20 @@ jobs:
548548
name: SQL Server 2019 Permission Integration Test
549549
runs-on: ubuntu-latest
550550

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

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-
561565
- name: Set up JDK ${{ env.JAVA_VERSION }} (${{ env.JAVA_VENDOR }})
562566
uses: actions/setup-java@v4
563567
with:
@@ -568,7 +572,7 @@ jobs:
568572
uses: gradle/actions/setup-gradle@v4
569573

570574
- 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
575+
run: ./gradlew integrationTestJdbcPermission -Dscalardb.jdbc.url=jdbc:sqlserver://localhost:1433;encrypt=true;trustServerCertificate=true -Dscalardb.jdbc.username=sa -Dscalardb.jdbc.password=SqlServer19
572576

573577
- name: Upload Gradle test reports
574578
if: always()
@@ -581,16 +585,20 @@ jobs:
581585
name: SQL Server 2022 Permission Integration Test
582586
runs-on: ubuntu-latest
583587

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

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-
594602
- name: Set up JDK ${{ env.JAVA_VERSION }} (${{ env.JAVA_VENDOR }})
595603
uses: actions/setup-java@v4
596604
with:
@@ -601,7 +609,7 @@ jobs:
601609
uses: gradle/actions/setup-gradle@v4
602610

603611
- 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
612+
run: ./gradlew integrationTestJdbcPermission -Dscalardb.jdbc.url=jdbc:sqlserver://localhost:1433;encrypt=true;trustServerCertificate=true -Dscalardb.jdbc.username=sa -Dscalardb.jdbc.password=SqlServer22
605613

606614
- name: Upload Gradle test reports
607615
if: always()

0 commit comments

Comments
 (0)