Skip to content

Commit 2014f32

Browse files
authored
Merge branch 'master' into dependabot/github_actions/actions-on-branch-master-02740c4fb1
2 parents 129d2a9 + 0faf2d9 commit 2014f32

File tree

64 files changed

+4628
-2474
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+4628
-2474
lines changed

.github/workflows/assign-dependabot-pr-reviewers.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,10 @@ jobs:
1010
runs-on: ubuntu-latest
1111
if: github.actor == 'dependabot[bot]'
1212

13-
permissions:
14-
pull-requests: write
15-
1613
steps:
1714
- name: Assign ScalarDB team as reviewers for Dependabot PRs
1815
env:
19-
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
16+
GH_TOKEN: ${{ secrets.ASSIGN_PR_REVIEWERS_PAT }}
2017
PR_NUMBER: ${{ github.event.pull_request.number }}
2118
REPOSITORY: ${{ github.repository }}
2219
run: gh pr edit $PR_NUMBER --repo $REPOSITORY --add-reviewer scalar-labs/scalardb

.github/workflows/ci.yaml

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1158,6 +1158,10 @@ jobs:
11581158
sa-password: "SqlServer17"
11591159
version: 2017
11601160

1161+
- name: Create database with Japanese collation for integration test
1162+
run: |
1163+
sqlcmd -S localhost -U sa -P SqlServer17 -Q "CREATE DATABASE test_db COLLATE Japanese_BIN2;"
1164+
11611165
- name: Set up JDK ${{ env.JAVA_VERSION }} (${{ env.JAVA_VENDOR }})
11621166
uses: actions/setup-java@v5
11631167
with:
@@ -1195,16 +1199,11 @@ jobs:
11951199
}
11961200
echo "JAVA_HOME=C:\Program Files\Java\${jdk_root_dir}" >> ${env:GITHUB_ENV}
11971201
1198-
- name: Create no superuser
1199-
run: ./ci/no-superuser/create-no-superuser-sqlserver.sh SqlServer17 10 3
1200-
shell: bash
1201-
timeout-minutes: 1
1202-
12031202
- name: Setup Gradle
12041203
uses: gradle/actions/setup-gradle@v4
12051204

12061205
- name: Execute Gradle 'integrationTestJdbc' task
1207-
run: ./gradlew.bat integrationTestJdbc "-Dscalardb.jdbc.url=jdbc:sqlserver://localhost:1433;databaseName=test_db;encrypt=true;trustServerCertificate=true" "-Dfile.encoding=UTF-8" "-Dscalardb.jdbc.username=no_superuser" "-Dscalardb.jdbc.password=no_superuser_password" ${{ matrix.mode.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }}
1206+
run: ./gradlew.bat integrationTestJdbc "-Dscalardb.jdbc.url=jdbc:sqlserver://localhost:1433;databaseName=test_db;encrypt=true;trustServerCertificate=true" "-Dfile.encoding=UTF-8" "-Dscalardb.jdbc.username=sa" "-Dscalardb.jdbc.password=SqlServer17" ${{ matrix.mode.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }}
12081207

12091208
- name: Upload Gradle test reports
12101209
if: always()
@@ -1239,6 +1238,10 @@ jobs:
12391238
steps:
12401239
- uses: actions/checkout@v5
12411240

1241+
- name: Create database with Japanese collation for integration test
1242+
run: |
1243+
docker exec sqlserver19 /opt/mssql-tools18/bin/sqlcmd -S localhost -C -U sa -P SqlServer19 -Q "CREATE DATABASE test_db COLLATE Japanese_BIN2;"
1244+
12421245
- name: Set up JDK ${{ env.JAVA_VERSION }} (${{ env.JAVA_VENDOR }})
12431246
uses: actions/setup-java@v5
12441247
with:
@@ -1266,15 +1269,11 @@ jobs:
12661269
container_id=$(docker create "container-registry.oracle.com/java/jdk:${{ env.INT_TEST_JAVA_RUNTIME_VERSION }}")
12671270
docker cp -L "$container_id:/usr/java/default" /usr/lib/jvm/oracle-jdk && docker rm "$container_id"
12681271
1269-
- name: Create no superuser
1270-
run: ./ci/no-superuser/create-no-superuser-sqlserver.sh SqlServer19 10 3 sqlserver19
1271-
timeout-minutes: 1
1272-
12731272
- name: Setup Gradle
12741273
uses: gradle/actions/setup-gradle@v4
12751274

12761275
- name: Execute Gradle 'integrationTestJdbc' task
1277-
run: ./gradlew integrationTestJdbc "-Dscalardb.jdbc.url=jdbc:sqlserver://localhost:1433;databaseName=test_db;encrypt=true;trustServerCertificate=true" -Dscalardb.jdbc.username=no_superuser -Dscalardb.jdbc.password=no_superuser_password ${{ matrix.mode.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }}
1276+
run: ./gradlew integrationTestJdbc "-Dscalardb.jdbc.url=jdbc:sqlserver://localhost:1433;databaseName=test_db;encrypt=true;trustServerCertificate=true" -Dscalardb.jdbc.username=sa -Dscalardb.jdbc.password=SqlServer19 ${{ matrix.mode.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }}
12781277

12791278
- name: Upload Gradle test reports
12801279
if: always()
@@ -1309,6 +1308,10 @@ jobs:
13091308
steps:
13101309
- uses: actions/checkout@v5
13111310

1311+
- name: Create database with Japanese collation for integration test
1312+
run: |
1313+
docker exec sqlserver22 /opt/mssql-tools18/bin/sqlcmd -S localhost -C -U sa -P SqlServer22 -Q "CREATE DATABASE test_db COLLATE Japanese_BIN2;"
1314+
13121315
- name: Set up JDK ${{ env.JAVA_VERSION }} (${{ env.JAVA_VENDOR }})
13131316
uses: actions/setup-java@v5
13141317
with:
@@ -1336,15 +1339,11 @@ jobs:
13361339
container_id=$(docker create "container-registry.oracle.com/java/jdk:${{ env.INT_TEST_JAVA_RUNTIME_VERSION }}")
13371340
docker cp -L "$container_id:/usr/java/default" /usr/lib/jvm/oracle-jdk && docker rm "$container_id"
13381341
1339-
- name: Create no superuser
1340-
run: ./ci/no-superuser/create-no-superuser-sqlserver.sh SqlServer22 10 3 sqlserver22
1341-
timeout-minutes: 1
1342-
13431342
- name: Setup Gradle
13441343
uses: gradle/actions/setup-gradle@v4
13451344

13461345
- name: Execute Gradle 'integrationTestJdbc' task
1347-
run: ./gradlew integrationTestJdbc "-Dscalardb.jdbc.url=jdbc:sqlserver://localhost:1433;databaseName=test_db;encrypt=true;trustServerCertificate=true" -Dscalardb.jdbc.username=no_superuser -Dscalardb.jdbc.password=no_superuser_password ${{ matrix.mode.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }}
1346+
run: ./gradlew integrationTestJdbc "-Dscalardb.jdbc.url=jdbc:sqlserver://localhost:1433;databaseName=test_db;encrypt=true;trustServerCertificate=true" -Dscalardb.jdbc.username=sa -Dscalardb.jdbc.password=SqlServer22 ${{ matrix.mode.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }}
13481347

13491348
- name: Upload Gradle test reports
13501349
if: always()

ci/no-superuser/create-no-superuser-sqlserver.sh

Lines changed: 0 additions & 94 deletions
This file was deleted.

0 commit comments

Comments
 (0)