update Makefile

This commit is contained in:
Andrei Stoica 2023-02-21 14:14:55 -05:00
parent 526b1501fd
commit 7e6ed82119
2 changed files with 7 additions and 12 deletions

View File

@ -1,11 +1,9 @@
WORKING_DIR := $(shell pwd)
.PHONY: deploy deploy-1.15.2 test up down
deploy: spigot/spigot.jar
deploy-1.15.2: build/spigot-1.15.2.jar spigot
cp build/spigot-1.15.2.jar spigot/spigot.jar
rev?=1.19.3
.PHONY: deploy test up down
deploy:
cp build/spigot-$(rev).jar spigot/spigot.jar
test:
docker run -it --name mc-test -p 25565:25565 --rm -v $(WORKING_DIR)/spigot:/mc \

View File

@ -1,15 +1,12 @@
LATEST := $(shell ls -rt build/spigot*.jar | tail -1)
rev?=latest
spigot/spigot.jar: build-latest spigot
cp $(LATEST) spigot/spigot.jar
build-latest: build-image
build: build-image
docker run -it --rm -v $(WORKING_DIR)/build:/mc -w /mc java-build java -cp /mc \
-jar BuildTools.jar
build/spigot-1.15.2.jar: build-image
docker run -it --rm -v $(WORKING_DIR)/build:/mc -w /mc java-build java -cp /mc \
-jar BuildTools.jar --rev 1.15.2
-jar BuildTools.jar --rev $(rev)
build-image: build/BuildTools.jar
docker build -t java-build build/