diff --git a/.circleci/config.yml b/.circleci/config.yml index d7e23312a..eed5a42c3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -553,9 +553,6 @@ jobs: echo 'export PATH=$JAVA_HOME/bin:$PATH' >> $BASH_ENV which java && java -version which javac && javac -version - - run: - name: "Build RocksDBJava Shared Library" - command: make V=1 J=8 -j8 rocksdbjava - run: name: "Test RocksDBJava" command: make V=1 J=8 -j8 jtest @@ -601,9 +598,6 @@ jobs: echo 'export PATH=$JAVA_HOME/bin:$PATH' >> $BASH_ENV which java && java -version which javac && javac -version - - run: - name: "Build RocksDBJava Shared Library" - command: make V=1 J=16 -j16 rocksdbjava - run: name: "Test RocksDBJava" command: make V=1 J=16 -j16 jtest diff --git a/Makefile b/Makefile index a1d0a3303..cd134af80 100644 --- a/Makefile +++ b/Makefile @@ -1216,7 +1216,7 @@ clean-rocks: $(FIND) . -name "*.[oda]" -exec rm -f {} \; $(FIND) . -type f -regex ".*\.\(\(gcda\)\|\(gcno\)\)" -exec rm -f {} \; -clean-rocksjava: +clean-rocksjava: clean-rocks rm -rf jl jls cd java && $(MAKE) clean