From 7f09c6cf0c63f372e598b6f6f6892bb488843b57 Mon Sep 17 00:00:00 2001 From: June Kelly Date: Wed, 27 Jul 2022 11:35:33 +0100 Subject: [PATCH] Merge pull request #9014 from overleaf/jlm-avoid-git-bridge-compile Avoid always compiling the git bridge on start GitOrigin-RevId: 2b8d4cf29c243d5de5f4cd026c63e1c8406771da --- services/git-bridge/Makefile | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/services/git-bridge/Makefile b/services/git-bridge/Makefile index b3b2c06fef..0ccd0574dc 100644 --- a/services/git-bridge/Makefile +++ b/services/git-bridge/Makefile @@ -1,18 +1,17 @@ # git-bridge makefile -MVN_OPTS := "--no-transfer-progress" +MVN_OPTS := --no-transfer-progress +MVN_TARGET := target/writelatex-git-bridge-1.0-SNAPSHOT-jar-with-dependencies.jar runtime-conf: /opt/envsubst < conf/envsubst_template.json > conf/runtime.json -run: package runtime-conf - java $(GIT_BRIDGE_JVM_ARGS) -jar \ - target/writelatex-git-bridge-1.0-SNAPSHOT-jar-with-dependencies.jar \ - conf/runtime.json +run: $(MVN_TARGET) runtime-conf + java $(GIT_BRIDGE_JVM_ARGS) -jar $(MVN_TARGET) conf/runtime.json -build: +$(MVN_TARGET): $(shell find src -type f) mvn $(MVN_OPTS) package -DskipTests @@ -28,4 +27,4 @@ package: clean mvn $(MVN_OPTS) package -DskipTests -.PHONY: run package build clean test runtime-conf +.PHONY: run package clean test runtime-conf