Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

3 changed files:

Changes:

  • .gitlab-ci.yml
    ... ... @@ -44,7 +44,8 @@ cache:
    44 44 
       environment:
    45 45 
         name: site
    46 46 
       script:
    47 
    -    - if [ -n "${PUBLISH_SITE}" ]; then ultreiaio-site-publish; fi
    47 
    +    - if [ -n "${PUBLISH_SITE}" ]; then ultreiaio-site-generate; fi
    48 
    +    - if [ -n "${PUBLISH_SITE}" ]; then bash .mvn/scripts/publish-site.sh; fi
    48 49
    49 50 
     .make-release: &make-release
    50 51 
       environment:

  • .mvn/scripts/publish-site.sh
    1 
    +#!/usr/bin/env bash
    2 
    +
    3 
    +source $(which ultreiaio-common)
    4 
    +
    5 
    +declare -l PROJECT
    6 
    +get_project_id PROJECT
    7 
    +
    8 
    +create_log_dir "${PROJECT}"
    9 
    +
    10 
    +execute_maven "-N -Pupdate-site-versions" "Update site versions" "site-update-versions"
    11 
    +
    12 
    +execute_maven "scm-publish:publish-scm" "Publish site" "site-publish"

  • pom.xml
    ... ... @@ -24,7 +24,7 @@
    24 24 
       <parent>
    25 25 
         <groupId>io.ultreia.maven</groupId>
    26 26 
         <artifactId>pom</artifactId>
    27 
    -    <version>2021.89</version>
    27 
    +    <version>2021.90</version>
    28 28 
       </parent>
    29 29
    30 30 
       <groupId>fr.ird.observe</groupId>
    ... ... @@ -161,7 +161,7 @@
    161 161 
         <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format>
    162 162 
         <buildDate>${maven.build.timestamp}</buildDate>
    163 163
    164 
    -    <lib.version.toolkit>5.0.40-SNAPSHOT</lib.version.toolkit>
    164 
    +<!--    <lib.version.toolkit>5.0.41-SNAPSHOT</lib.version.toolkit>-->
    165 165
    166 166 
         <lib.version.ognl>3.1.29</lib.version.ognl>
    167 167 
         <!--can't use 1.4.197 (date has changed + blob also)-->
    ... ... @@ -220,10 +220,7 @@
    220 220 
         <!-- Always deploy asap -->
    221 221 
         <deployAtEnd>false</deployAtEnd>
    222 222
    223 
    -    <siteMainDirectory>${user.home}/.mvn/site-cache</siteMainDirectory>
    224 
    -    <scmpublish.checkoutDirectory>\${siteMainDirectory}/${project.groupId}/${project.artifactId}</scmpublish.checkoutDirectory>
    225 223 
         <scmpublish.subDirectory>${project.version}</scmpublish.subDirectory>
    226 
    -    <scmpublish.tryUpdate>true</scmpublish.tryUpdate>
    227 224
    228 225 
         <!-- http plugin configuration -->
    229 226 
         <http.serviceProviderName>fr.ird.observe.services.ObserveServicesProvider</http.serviceProviderName>
    ... ... @@ -983,5 +980,28 @@
    983 980 
             </plugins>
    984 981 
           </build>
    985 982 
         </profile>
    983 
    +
    984 
    +    <profile>
    985 
    +      <id>update-site-versions</id>
    986 
    +      <build>
    987 
    +        <defaultGoal>pre-site</defaultGoal>
    988 
    +        <plugins>
    989 
    +          <plugin>
    990 
    +            <groupId>fr.ird.observe</groupId>
    991 
    +            <artifactId>toolkit-maven-plugin</artifactId>
    992 
    +            <version>${lib.version.toolkit}</version>
    993 
    +            <executions>
    994 
    +              <execution>
    995 
    +                <id>default-update-site-versions</id>
    996 
    +                <phase>pre-site</phase>
    997 
    +                <goals>
    998 
    +                  <goal>update-site-versions</goal>
    999 
    +                </goals>
    1000 
    +              </execution>
    1001 
    +            </executions>
    1002 
    +          </plugin>
    1003 
    +        </plugins>
    1004 
    +      </build>
    1005 
    +    </profile>
    986 1006 
       </profiles>
    987 1007 
     </project>

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.