From aad2a86352c2702378b9103bfa1b87cee061e607 Mon Sep 17 00:00:00 2001 From: Gabriel Roldan Date: Tue, 6 Aug 2024 23:26:15 -0300 Subject: [PATCH] Run deploy in a single step Otherwise for non snapshot builds the core step will deploy the community and extensions roo poms and the extensions and core steps will get a 409 error --- Makefile | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/Makefile b/Makefile index c939d92..f2a92c0 100644 --- a/Makefile +++ b/Makefile @@ -25,36 +25,14 @@ install-community: -P$(COMMUNITY_MODULES) .PHONY: deploy -deploy: deploy-core deploy-extensions deploy-community - -.PHONY: deploy-core -deploy-core: +deploy: ./mvnw deploy -f geoserver/src/pom.xml --batch-mode -DskipTests -ntp -fae \ -Dsort.skip=true -Dspotless.apply.skip=true \ -DretryFailedDeploymentCount=10 \ -DallowIncompleteProjects=true \ -DaltDeploymentRepository='github::https://maven.pkg.github.com/camptocamp/geoserver-cloud-geoserver' \ - -Dmaven.resolver.transport=wagon - -.PHONY: deploy-extensions -deploy-extensions: - ./mvnw deploy -f geoserver/src/extension/pom.xml --batch-mode -DskipTests -ntp -fae \ - -Dsort.skip=true -Dspotless.apply.skip=true \ - -DretryFailedDeploymentCount=10 \ - -DallowIncompleteProjects=true \ - -DaltDeploymentRepository='github::https://maven.pkg.github.com/camptocamp/geoserver-cloud-geoserver' \ - -Dmaven.resolver.transport=wagon \ - -P$(EXTENSIONS) - -.PHONY: deploy-community -deploy-community: - ./mvnw deploy -f geoserver/src/community/pom.xml --batch-mode -DskipTests -ntp -fae \ - -Dsort.skip=true -Dspotless.apply.skip=true \ - -DretryFailedDeploymentCount=10 \ - -DallowIncompleteProjects=true \ - -DaltDeploymentRepository='github::https://maven.pkg.github.com/camptocamp/geoserver-cloud-geoserver' \ -Dmaven.resolver.transport=wagon \ - -P$(COMMUNITY_MODULES) + -P$(EXTENSIONS),$(COMMUNITY_MODULES) .PHONY: purge-dependencies