From b00b75fbb6380a8a457cc1b7109248634603d405 Mon Sep 17 00:00:00 2001 From: shi yuhang <52435083+shiyuhang0@users.noreply.github.com> Date: Mon, 6 Jan 2025 10:42:28 +0800 Subject: [PATCH] Try to fix proto (#2803) --- .github/workflows/TLS-test.yml | 8 +++++++- tikv-client/scripts/proto.sh | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/TLS-test.yml b/.github/workflows/TLS-test.yml index 725ae8d23e..6244cab683 100644 --- 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 \ No newline at end of file + 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 index 575f2483a7..3e93bdae0f 100755 --- 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 ..