Merge pull request #970 from ClickHouse/develop

Merge patch10

Author: zhicwu

.github/workflows/benchmark.yml

@@ -107,7 +107,7 @@ jobs:
         continue-on-error: true
       - name: Build project
         run: |
-          mvn --batch-mode --update-snapshots -DskipTests -pl clickhouse-benchmark -am package
+          mvn --batch-mode -DskipTests -pl clickhouse-benchmark -am package
           cd clickhouse-benchmark
           java -DclickhouseVersion="21.8" -jar target/benchmarks.jar -rf json ${{ github.event.inputs.options }} > output.txt
           echo "BENCHMARK_REPORT<<EOF" >> $GITHUB_ENV

.github/workflows/build.yml

@@ -27,6 +27,10 @@ on:
         description: "Pull request#"
         required: false
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.event.number || github.sha }}
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -42,7 +46,7 @@ jobs:
           - clickhouse: "21.8"
             protocol: grpc
       fail-fast: false
-    timeout-minutes: 45
+    timeout-minutes: 30
     name: Build against ClickHouse ${{ matrix.clickhouse }} (${{ matrix.protocol }})
     steps:
       - name: Check out Git repository
@@ -76,21 +80,18 @@ jobs:
           </toolchains>
           EOF
       - name: Install JDK 8 and Maven
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: 8
-      # Step that does that actual cache save and restore
-      - name: Cache maven dependencies
-        uses: actions/cache@v2
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-build-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-build-
+          cache: 'maven'
+      # or take below workaround as mentioned at https://github.com/actions/virtual-environments/issues/1499#issuecomment-689467080
+      # -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120
+      - name: Check
+        run: mvn --batch-mode --update-snapshots -Drelease -DskipTests install
       - name: Build
         run: |
-          mvn --batch-mode --update-snapshots -Drelease -DclickhouseVersion=${{ matrix.clickhouse }} -Dprotocol=${{ matrix.protocol }} verify
+          mvn --batch-mode -Drelease -DclickhouseVersion=${{ matrix.clickhouse }} -Dprotocol=${{ matrix.protocol }} verify
       - name: Upload test results
         uses: actions/upload-artifact@v2
         if: failure()

.github/workflows/third_party_libs.yml

@@ -6,7 +6,7 @@ on:
       version:
         description: "Release version"
         required: true
-        default: "1.0.0"
+        default: "1.2.0"
 
 jobs:
   release:

.github/workflows/timezone.yml

@@ -26,6 +26,10 @@ on:
         description: "Pull request#"
         required: false
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.event.number || github.sha }}
+  cancel-in-progress: true
+
 jobs:
   timezone:
     runs-on: ubuntu-latest
@@ -34,6 +38,7 @@ jobs:
         serverTz: ["Asia/Chongqing", "America/Los_Angeles", "Etc/UTC", "Europe/Berlin", "Europe/Moscow"]
         clientTz: ["Asia/Chongqing", "America/Los_Angeles", "Etc/UTC", "Europe/Berlin", "Europe/Moscow"]
       fail-fast: false
+    timeout-minutes: 30
     name: "TimeZone(C/S): ${{ matrix.clientTz }} vs. ${{ matrix.serverTz }}"
     steps:
       - name: Check out Git repository
@@ -44,26 +49,29 @@ jobs:
             origin pull/${{ github.event.inputs.pr }}/merge:merged-pr && git checkout merged-pr
         if: github.event.inputs.pr != ''
       - name: Set up JDK 8
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
+          distribution: 'temurin'
           java-version: 8
-      - name: Cache maven dependencies
-        uses: actions/cache@v2
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-build-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-build-
+          cache: 'maven'
       - name: Install dependencies
         run: |
           mvn --batch-mode --update-snapshots \
             --projects clickhouse-client -DskipTests \
             --also-make install
       - name: Test JDBC driver
         run: |
-          mvn --batch-mode --update-snapshots \
-            --projects clickhouse-jdbc \
+          mvn --batch-mode --projects clickhouse-jdbc \
             -DclickhouseTimezone=${{ matrix.serverTz }} \
             -DclickhouseVersion=22.3 \
             -Duser.timezone=${{ matrix.clientTz }} \
             --also-make clean verify
+      - name: Upload test results
+        uses: actions/upload-artifact@v2
+        if: failure()
+        with:
+          name: result ${{ github.job }}
+          path: |
+            **/target/failsafe-reports
+            **/target/surefire-reports
+