From 0488a10ed813ecbad76df09703ff9e42d65440ce Mon Sep 17 00:00:00 2001 From: SteVio89 Date: Thu, 10 Feb 2022 09:45:02 +0100 Subject: [PATCH] [circleci] update settings to for deplay artifacts --- .circleci.settings.xml | 3 ++- .circleci/config.yml | 18 +++++++++++++++--- languagetool-commandline/pom.xml | 3 +-- languagetool-dev/pom.xml | 3 +-- languagetool-rpm-package/pom.xml | 3 +-- languagetool-standalone/pom.xml | 2 +- languagetool-tools/pom.xml | 3 +-- languagetool-wikipedia/pom.xml | 2 +- pom.xml | 12 ++++++++---- 9 files changed, 31 insertions(+), 18 deletions(-) diff --git a/.circleci.settings.xml b/.circleci.settings.xml index 944bd21c259a..b5e0d4eb6a80 100644 --- a/.circleci.settings.xml +++ b/.circleci.settings.xml @@ -21,7 +21,8 @@ - snapshots + repo.languagetool.org + ${env.ARTIFACTORY_USERNAME} ${env.ARTIFACTORY_API_TOKEN} diff --git a/.circleci/config.yml b/.circleci/config.yml index f8b09c8345c4..87f302a56670 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,6 +3,9 @@ parameters: run_on_pull: default: true type: boolean + deploy_after_test: + default: false + type: boolean orbs: shallow-checkout: expo/shallow-checkout@1.0.2 workflows: @@ -89,6 +92,9 @@ commands: ignore_diff: type: boolean default: false + deploy_artifact: + type: boolean + default: false steps: - when: condition: << parameters.ignore_diff >> @@ -100,6 +106,10 @@ commands: then echo "" > /home/circleci/git_diffs.txt cd $CIRCLE_WORKING_DIRECTORY && mvn -pl '!languagetool-rpm-package' test -fae + if << parameters.deploy_artifact >> = true || << pipeline.deploy_after_test >> + then + cd mvn -s .circleci.settings.xml -pl '!languagetool-rpm-package' -DskipTests deploy + fi else echo "No changes detected in <>" fi @@ -112,6 +122,10 @@ commands: if grep -q -e << parameters.path_to_check >>/.* /home/circleci/git_diffs.txt then cd $CIRCLE_WORKING_DIRECTORY && mvn --projects << parameters.path_to_check >> --also-make test -fae + if << parameters.deploy_artifact >> = true || << pipeline.deploy_after_test >> + then + cd mvn -s .circleci.settings.xml --projects << parameters.path_to_check >> -DskipTests deploy + fi else echo "No changes detected in <>" fi @@ -124,9 +138,7 @@ commands: find . -type f -regex ".*/target/surefire-reports/.*xml" -exec cp {} ~/test-results/junit/ \; when: always - store_test_results: - path: ~/test-results -# - store_artifacts: -# path: ~test-results/junit + path: ~/test-results executors: docker-openjdk8: docker: diff --git a/languagetool-commandline/pom.xml b/languagetool-commandline/pom.xml index 104a7c191003..45595ec3910d 100644 --- a/languagetool-commandline/pom.xml +++ b/languagetool-commandline/pom.xml @@ -114,8 +114,7 @@ maven-deploy-plugin ${maven-deploy-plugin.version} - false - + true diff --git a/languagetool-dev/pom.xml b/languagetool-dev/pom.xml index acc8e71a0fc9..2f27804632b8 100644 --- a/languagetool-dev/pom.xml +++ b/languagetool-dev/pom.xml @@ -120,8 +120,7 @@ maven-deploy-plugin ${maven-deploy-plugin.version} - false - + true diff --git a/languagetool-rpm-package/pom.xml b/languagetool-rpm-package/pom.xml index 812cb2bce5c7..d93ab5ce64f1 100644 --- a/languagetool-rpm-package/pom.xml +++ b/languagetool-rpm-package/pom.xml @@ -1192,8 +1192,7 @@ maven-deploy-plugin ${maven-deploy-plugin.version} - false - + true diff --git a/languagetool-standalone/pom.xml b/languagetool-standalone/pom.xml index f438cc9a2996..3354aff40d3c 100644 --- a/languagetool-standalone/pom.xml +++ b/languagetool-standalone/pom.xml @@ -165,7 +165,7 @@ maven-deploy-plugin ${maven-deploy-plugin.version} - false + true diff --git a/languagetool-tools/pom.xml b/languagetool-tools/pom.xml index b90827c53669..72f9bf9821d3 100644 --- a/languagetool-tools/pom.xml +++ b/languagetool-tools/pom.xml @@ -85,8 +85,7 @@ maven-deploy-plugin ${maven-deploy-plugin.version} - false - + true diff --git a/languagetool-wikipedia/pom.xml b/languagetool-wikipedia/pom.xml index 712fff4f1b4c..515ffd8762ec 100644 --- a/languagetool-wikipedia/pom.xml +++ b/languagetool-wikipedia/pom.xml @@ -226,7 +226,7 @@ maven-deploy-plugin ${maven-deploy-plugin.version} - false + true diff --git a/pom.xml b/pom.xml index 82ef1022d5ff..93cce936e68c 100644 --- a/pom.xml +++ b/pom.xml @@ -38,14 +38,18 @@ git@github.com:languagetool-org/languagetool.git - - snapshots - a0oneieyqx0fu-artifactory-primary-0-snapshots - https://languagetool.jfrog.io/artifactory/languagetool-libs-snapshot + repo.languagetool.org + languagetool-os-snapshot + https://repo.languagetool.org/artifactory/languagetool-os-snapshot/ + + repo.languagetool.org + languagetool-os-snapshot + https://repo.languagetool.org/artifactory/languagetool-os-release/ +