Skip to content

Commit b00b75f

Browse files
authored
Try to fix proto (#2803)
1 parent 294bdaf commit b00b75f

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

.github/workflows/TLS-test.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@ jobs:
2727
distribution: ${{ matrix.distribution }}
2828
cache: maven
2929

30+
- name: set up docker compose
31+
uses: KengoTODA/actions-setup-docker-compose@v1
32+
with:
33+
version: '2.14.2' # the full version of `docker-compose` command
34+
35+
3036
- name: add host and copy properties
3137
run: |
3238
echo -e "127.0.0.1 pd \n127.0.0.1 tikv" | sudo tee -a /etc/hosts
@@ -46,4 +52,4 @@ jobs:
4652
run: sed -i 's/^#//' core/src/test/resources/tidb_config.properties
4753

4854
- name: test JKS
49-
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
55+
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

tikv-client/scripts/proto.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ CURRENT_DIR=`pwd`
1818
TISPARK_HOME="$(cd "`dirname "$0"`"/../..; pwd)"
1919
cd $TISPARK_HOME/tikv-client
2020

21-
tipb_hash=4d69c6f95e683dfb5859277563bf896aca06ec34
21+
tipb_hash=29e23c62eeace5912f696d1b184b63d5dc3edcce
2222

2323
if [ -d "tipb" ]; then
2424
cd tipb; git fetch -p; git checkout ${tipb_hash}; cd ..

0 commit comments

Comments
 (0)