Skip to content

Commit

Permalink
ci: Revert "Rename profile 'deploy-local' to 'ci-build'"
Browse files Browse the repository at this point in the history
Partial revert of 51725c9.

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.
  • Loading branch information
j1elo committed May 23, 2024
1 parent 4fb2403 commit 29fccea
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions ci-scripts/kurento_maven_deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
6 changes: 3 additions & 3 deletions clients/java/maven-settings/settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
-->
<profiles>
<profile>
<id>ci-build</id>
<id>deploy-local</id>
<activation>
<!--
Activate when the environment variable `MAVEN_LOCAL_REPOSITORY_PATH` is defined:
Expand All @@ -59,13 +59,13 @@
</properties>
<repositories>
<repository>
<id>ci-build</id>
<id>deploy-local</id>
<url>file://${env.MAVEN_LOCAL_REPOSITORY_PATH}</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>ci-build</id>
<id>deploy-local</id>
<url>file://${env.MAVEN_LOCAL_REPOSITORY_PATH}</url>
</pluginRepository>
</pluginRepositories>
Expand Down

0 comments on commit 29fccea

Please sign in to comment.