Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Try to fix proto #2803

Merged
merged 4 commits into from
Jan 6, 2025
+8 −2
Merged

Try to fix proto #2803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5bec162
try to fix
shiyuhang0 Jan 3, 2025
be6fc7b
fix tipb
shiyuhang0 Jan 3, 2025
4a7a615
fix tipb
shiyuhang0 Jan 3, 2025
046512b
fix docker
shiyuhang0 Jan 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .github/workflows/TLS-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion tikv-client/scripts/proto.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ..
Expand Down
Loading