andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix make clean fail after java build (#9710)

Browse Source 
Summary:
Seems clean-rocksjava and clean-rocks conflict.
Also remove unnecessary step in java CI build, otherwise it will rebuild
the code again as java make sample do clean up first.

Pull Request resolved: https://github.com/facebook/rocksdb/pull/9710

Test Plan: `make rocksdbjava && make clean` should return success

Reviewed By: riversand963

Differential Revision: D35122872

Pulled By: jay-zhuang

fbshipit-source-id: 2a15b83e7a763c0fc0e42e1f35aac9551f951ece
This commit is contained in:
Jay Zhuang 2022-03-24 13:39:15 -07:00 committed by Facebook GitHub Bot
parent 409635cb2a
commit 81d1cdca7f
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.circleci/config.yml
View File

@ -553,9 +553,6 @@ jobs:
echo 'export PATH=$JAVA_HOME/bin:$PATH' >> $BASH_ENV echo 'export PATH=$JAVA_HOME/bin:$PATH' >> $BASH_ENV
which java && java -version which java && java -version
which javac && javac -version which javac && javac -version
- run:
name: "Build RocksDBJava Shared Library"
command: make V=1 J=8 -j8 rocksdbjava
- run: - run:
name: "Test RocksDBJava" name: "Test RocksDBJava"
command: make V=1 J=8 -j8 jtest command: make V=1 J=8 -j8 jtest
@ -601,9 +598,6 @@ jobs:
echo 'export PATH=$JAVA_HOME/bin:$PATH' >> $BASH_ENV echo 'export PATH=$JAVA_HOME/bin:$PATH' >> $BASH_ENV
which java && java -version which java && java -version
which javac && javac -version which javac && javac -version
- run:
name: "Build RocksDBJava Shared Library"
command: make V=1 J=16 -j16 rocksdbjava
- run: - run:
name: "Test RocksDBJava" name: "Test RocksDBJava"
command: make V=1 J=16 -j16 jtest command: make V=1 J=16 -j16 jtest

2
Makefile
View File

@ -1216,7 +1216,7 @@ clean-rocks:
$(FIND) . -name "*.[oda]" -exec rm -f {} \; $(FIND) . -name "*.[oda]" -exec rm -f {} \;
$(FIND) . -type f -regex ".*\.\(\(gcda\)\|\(gcno\)\)" -exec rm -f {} \; $(FIND) . -type f -regex ".*\.\(\(gcda\)\|\(gcno\)\)" -exec rm -f {} \;
clean-rocksjava: clean-rocksjava: clean-rocks
rm -rf jl jls rm -rf jl jls
cd java && $(MAKE) clean cd java && $(MAKE) clean