Merge branch 'master' into visible-bugfix

pingcap · Jan 6, 2025 · 8d98580 · 8d98580
2 parents 103ac7f + b00b75f
commit 8d98580
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.github/workflows/TLS-test.yml b/.github/workflows/TLS-test.yml
@@ -27,6 +27,12 @@ jobs:
           distribution: ${{ matrix.distribution }}
           cache: maven
 
+      - name: set up docker compose
+        uses: KengoTODA/actions-setup-docker-compose@v1
+        with:
+          version: '2.14.2' # the full version of `docker-compose` command
+
+
       - name: add host and copy properties
         run: |
           echo -e "127.0.0.1   pd \n127.0.0.1   tikv" | sudo tee -a /etc/hosts
@@ -46,4 +52,4 @@ jobs:
         run: sed -i 's/^#//' core/src/test/resources/tidb_config.properties
 
       - name: test JKS
-        run: mvn test -am -pl core -Dtest=moo -DwildcardSuites=com.pingcap.tispark.tls.JDBCTLSSuite,com.pingcap.tispark.tls.TiKVClientTLSSuite,com.pingcap.tispark.tls.TiSparkTLSSuite -DfailIfNoTests=false
+        run: mvn test -am -pl core -Dtest=moo -DwildcardSuites=com.pingcap.tispark.tls.JDBCTLSSuite,com.pingcap.tispark.tls.TiKVClientTLSSuite,com.pingcap.tispark.tls.TiSparkTLSSuite -DfailIfNoTests=false
diff --git a/tikv-client/scripts/proto.sh b/tikv-client/scripts/proto.sh
@@ -18,7 +18,7 @@ CURRENT_DIR=`pwd`
 TISPARK_HOME="$(cd "`dirname "$0"`"/../..; pwd)"
 cd $TISPARK_HOME/tikv-client
 
-tipb_hash=4d69c6f95e683dfb5859277563bf896aca06ec34
+tipb_hash=29e23c62eeace5912f696d1b184b63d5dc3edcce
 
 if [ -d "tipb" ]; then
 	cd tipb; git fetch -p; git checkout ${tipb_hash}; cd ..