From 29fcceae14f03f3c67264799d7e8ae8edca25650 Mon Sep 17 00:00:00 2001 From: Juan Navarro Date: Thu, 23 May 2024 15:11:14 +0200 Subject: [PATCH] ci: Revert "Rename profile 'deploy-local' to 'ci-build'" Partial revert of 51725c9593fc1eb80b5654b531047b47d81fb635. Reason: The name "deploy-local" is a natural extension of the other deployment profile, "deploy". It also is clearer to signify that this profile should be used just for deployments to a local repository. The previous name, "ci-build", could make you think that it should be enabled for any kind of builds in CI, which is not correct. This profile is to be used only for running "mvn deploy" in order to deploy into a local directory, which later gets archived by the CI job. --- ci-scripts/kurento_maven_deploy.sh | 4 ++-- clients/java/maven-settings/settings.xml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ci-scripts/kurento_maven_deploy.sh b/ci-scripts/kurento_maven_deploy.sh index 94a1ec213..bdc8c3bc4 100755 --- a/ci-scripts/kurento_maven_deploy.sh +++ b/ci-scripts/kurento_maven_deploy.sh @@ -137,9 +137,9 @@ fi # First, make an initial build that gets deployed to a local repository. # This is what gets archived by CI, and passed along to dependent jobs. -# The repo is set by the `ci-build` profile from Maven's `settings.xml`. +# The repo is set by the `deploy-local` profile from Maven's `settings.xml`. -mvn "${MVN_ARGS[@]}" -Pci-build clean package "$MAVEN_DEPLOY_PLUGIN:deploy" || { +mvn "${MVN_ARGS[@]}" -Pdeploy-local clean package "$MAVEN_DEPLOY_PLUGIN:deploy" || { log "ERROR: Command failed: mvn deploy (local repo)" exit 1 } diff --git a/clients/java/maven-settings/settings.xml b/clients/java/maven-settings/settings.xml index 88bdd77b0..22b21d526 100644 --- a/clients/java/maven-settings/settings.xml +++ b/clients/java/maven-settings/settings.xml @@ -38,7 +38,7 @@ --> - ci-build + deploy-local