From 99bffda143a1bba636ace8a56801b9b38259aada Mon Sep 17 00:00:00 2001 From: Jordan Rose Date: Thu, 19 Nov 2020 16:20:16 -0800 Subject: [PATCH] Docker: Remove unnecessary extra copy of rust-toolchain --- java/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/java/Makefile b/java/Makefile index 2044d3db..9fc04eb4 100644 --- a/java/Makefile +++ b/java/Makefile @@ -18,12 +18,12 @@ java_build: DOCKER_EXTRA=$(shell [ -L build ] && P=$$(readlink build) && echo -v java_build: docker_image $(DOCKER) run --rm --user $$(id -u):$$(id -g) \ -v `cd .. && pwd`/:/home/libsignal/src $(DOCKER_EXTRA) $(DOCKER_IMAGE) \ - sh -c "cp rust-toolchain src/; cd src/java; ./gradlew build" + sh -c "cd src/java; ./gradlew build" java_test: java_build $(DOCKER) run --rm --user $$(id -u):$$(id -g) \ -v `cd .. && pwd`/:/home/libsignal/src $(DOCKER_EXTRA) $(DOCKER_IMAGE) \ - sh -c "cp rust-toolchain src/; cd src/java; ./gradlew test" + sh -c "cd src/java; ./gradlew test" SONATYPE_USERNAME ?= SONATYPE_PASSWORD ?= @@ -44,7 +44,7 @@ publish_java: docker_image -v `cd .. && pwd`/:/home/libsignal/src $(DOCKER_EXTRA) \ -v $(KEYRING_VOLUME):/home/libsignal/keyring \ $(DOCKER_IMAGE) \ - sh -c "cp rust-toolchain src; cd src/java; ./gradlew uploadArchives \ + sh -c "cd src/java; ./gradlew uploadArchives \ -PwhisperSonatypeUsername='$(SONATYPE_USERNAME)' \ -PwhisperSonatypePassword='$(SONATYPE_PASSWORD)' \ -Psigning.secretKeyRingFile='/home/libsignal/keyring/$(KEYRING_FILE_ROOT)' \