[circleci] update settings to for deplay artifacts

epfl-lara · Feb 10, 2022 · 0488a10 · 0488a10
1 parent 0aa652f
commit 0488a10
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 18 deletions.
diff --git a/.circleci.settings.xml b/.circleci.settings.xml
@@ -21,7 +21,8 @@
 <settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
   <servers>
     <server>
-      <id>snapshots</id>
+      <id>repo.languagetool.org</id>
+      <username>${env.ARTIFACTORY_USERNAME}</username>
       <password>${env.ARTIFACTORY_API_TOKEN}</password>
     </server>
   </servers>

diff --git 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/[email protected]
 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 <<parameters.path_to_check>>"
                   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 <<parameters.path_to_check>>"
                   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
@@ -114,8 +114,7 @@
                 <artifactId>maven-deploy-plugin</artifactId>
                 <version>${maven-deploy-plugin.version}</version>
                 <configuration>
-                    <skip>false</skip>
-                    <!-- TODO: decide if this should published to a maven-repo as well. -->
+                    <skip>true</skip>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/languagetool-dev/pom.xml b/languagetool-dev/pom.xml
@@ -120,8 +120,7 @@
                 <artifactId>maven-deploy-plugin</artifactId>
                 <version>${maven-deploy-plugin.version}</version>
                 <configuration>
-                    <skip>false</skip>
-                    <!-- TODO: decide if this should published to a maven-repo as well. -->
+                    <skip>true</skip>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/languagetool-rpm-package/pom.xml b/languagetool-rpm-package/pom.xml
@@ -1192,8 +1192,7 @@
                 <artifactId>maven-deploy-plugin</artifactId>
                 <version>${maven-deploy-plugin.version}</version>
                 <configuration>
-                    <skip>false</skip>
-                    <!-- TODO: decide if this should published to a maven-repo as well. -->
+                    <skip>true</skip>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/languagetool-standalone/pom.xml b/languagetool-standalone/pom.xml
@@ -165,7 +165,7 @@
                 <artifactId>maven-deploy-plugin</artifactId>
                 <version>${maven-deploy-plugin.version}</version>
                 <configuration>
-                    <skip>false</skip>
+                    <skip>true</skip>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/languagetool-tools/pom.xml b/languagetool-tools/pom.xml
@@ -85,8 +85,7 @@
                 <artifactId>maven-deploy-plugin</artifactId>
                 <version>${maven-deploy-plugin.version}</version>
                 <configuration>
-                    <skip>false</skip>
-                    <!-- TODO: decide if this should published to a maven-repo as well. -->
+                    <skip>true</skip>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/languagetool-wikipedia/pom.xml b/languagetool-wikipedia/pom.xml
@@ -226,7 +226,7 @@
                 <artifactId>maven-deploy-plugin</artifactId>
                 <version>${maven-deploy-plugin.version}</version>
                 <configuration>
-                    <skip>false</skip>
+                    <skip>true</skip>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/pom.xml b/pom.xml
@@ -38,14 +38,18 @@
         <url>[email protected]:languagetool-org/languagetool.git</url>
     </scm>
 
-    <!-- TODO: update to new repo for snapshots -->
     <distributionManagement>
         <snapshotRepository>
             <!-- see ~/.m2/settings.xml for authentication -->
-            <id>snapshots</id>
-            <name>a0oneieyqx0fu-artifactory-primary-0-snapshots</name>
-            <url>https://languagetool.jfrog.io/artifactory/languagetool-libs-snapshot</url>
+            <id>repo.languagetool.org</id>
+            <name>languagetool-os-snapshot</name>
+            <url>https://repo.languagetool.org/artifactory/languagetool-os-snapshot/</url>
         </snapshotRepository>
+        <repository>
+            <id>repo.languagetool.org</id>
+            <name>languagetool-os-snapshot</name>
+            <url>https://repo.languagetool.org/artifactory/languagetool-os-release/</url>
+        </repository>
     </distributionManagement>
 
     <!-- TODO remove if nothing failed after reorganize