Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
alex268 committed Feb 6, 2024
2 parents c9c5ba9 + 88b31f9 commit 7e73d06
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 15 deletions.
19 changes: 10 additions & 9 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
distribution: 'temurin'
Expand All @@ -43,7 +43,7 @@ jobs:
- name: Checkout YDB Java SDK
if: env.NEED_SDK == 'true'
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: ydb-platform/ydb-java-sdk
ref: develop
Expand All @@ -60,7 +60,7 @@ jobs:

- name: Checkout YC Auth provider
if: env.NEED_SDK == 'true'
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: ydb-platform/ydb-java-yc
ref: develop
Expand All @@ -82,6 +82,7 @@ jobs:
run: mvn $MAVEN_ARGS package

coverage:
if: github.repository == 'ydb-platform/ydb-jdbc-driver'
name: Coverage JDBC Driver
runs-on: ubuntu-latest
needs: build
Expand All @@ -91,10 +92,10 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: 8
distribution: 'temurin'
Expand All @@ -111,7 +112,7 @@ jobs:
- name: Checkout YDB Java SDK
if: env.NEED_SDK == 'true'
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: ydb-platform/ydb-java-sdk
ref: develop
Expand All @@ -128,7 +129,7 @@ jobs:

- name: Checkout YC Auth provider
if: env.NEED_SDK == 'true'
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: ydb-platform/ydb-java-yc
ref: develop
Expand All @@ -150,4 +151,4 @@ jobs:
run: mvn $MAVEN_ARGS test

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
8 changes: 4 additions & 4 deletions .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: true

Expand All @@ -38,7 +38,7 @@ jobs:
script: core.setFailed('Release name must be equal to project version')

- name: Set up JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: 8
distribution: 'temurin'
Expand Down Expand Up @@ -67,12 +67,12 @@ jobs:
gpg --list-secret-keys --keyid-format LONG
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: true

- name: Set up Maven Central Repository
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: 8
distribution: 'temurin'
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 2.0.7 ##

* Added getter for GrpcTransport to YdbContext

## 2.0.6 ##

* Upgraded Java SDK version
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ Specify the YDB JDBC driver in the dependencies:
<dependency>
<groupId>tech.ydb.jdbc</groupId>
<artifactId>ydb-jdbc-driver</artifactId>
<version>2.0.6</version>
<version>2.0.7</version>
</dependency>

<!-- Shaded version with included dependencies -->
<dependency>
<groupId>tech.ydb.jdbc</groupId>
<artifactId>ydb-jdbc-driver-shaded</artifactId>
<version>2.0.6</version>
<version>2.0.7</version>
</dependency>
</dependencies>
```
Expand Down

0 comments on commit 7e73d06

Please sign in to comment.