March 2017 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreia.io/ird-observe][develop-5.x] add nuiton before central repo
by Tony CHEMIT 03 Mar '17

03 Mar '17

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: bcd48848 by Tony CHEMIT at 2017-03-03T18:12:09+01:00 add nuiton before central repo - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -238,6 +238,16 @@ </releases> </repository> </repositories> + <pluginRepositories> + <pluginRepository> + <id>before-central</id> + <url>https://nexus.nuiton.org/nexus/content/repositories/central-releases</url> + <releases> + <enabled>true</enabled> + <checksumPolicy>fail</checksumPolicy> + </releases> + </pluginRepository> + </pluginRepositories> <dependencyManagement> <dependencies> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/bcd4884838f9d8f345243ea108…

1 0

[Git][ultreia.io/ird-observe][develop-5.x] add nuiton before central repo
by Tony CHEMIT 03 Mar '17

03 Mar '17

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: c992525f by Tony CHEMIT at 2017-03-03T18:08:56+01:00 add nuiton before central repo - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -228,6 +228,16 @@ </properties> + <repositories> + <repository> + <id>before-central</id> + <url>https://nexus.nuiton.org/nexus/content/repositories/central-releases</url> + <releases> + <enabled>true</enabled> + <checksumPolicy>fail</checksumPolicy> + </releases> + </repository> + </repositories> <dependencyManagement> <dependencies> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/c992525f3c8e5aa6a372a23167…

1 0

[Git][ultreia.io/ird-observe][develop-5.x] Meilleure gestion de l'action Consolidation pour tenir quelque soit le nombre de…
by Tony CHEMIT 03 Mar '17

03 Mar '17

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: ef5095cd by Tony CHEMIT at 2017-03-03T17:49:03+01:00 Meilleure gestion de l'action Consolidation pour tenir quelque soit le nombre de marées à traiter (See #732) - - - - - 4 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java - application-swing/src/main/resources/i18n/application-swing_en_GB.properties - application-swing/src/main/resources/i18n/application-swing_es_ES.properties - application-swing/src/main/resources/i18n/application-swing_fr_FR.properties Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java @@ -22,12 +22,9 @@ package fr.ird.observe.application.swing.ui.admin.consolidate; import com.google.common.collect.ImmutableSet; +import fr.ird.observe.application.swing.ObserveRunner; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; -import fr.ird.observe.application.swing.ui.admin.AdminStep; -import fr.ird.observe.application.swing.ui.admin.AdminTabUI; -import fr.ird.observe.application.swing.ui.admin.AdminTabUIHandler; -import fr.ird.observe.application.swing.ui.admin.AdminUI; -import fr.ird.observe.application.swing.ui.admin.AdminUIModel; +import fr.ird.observe.application.swing.ui.admin.*; import fr.ird.observe.application.swing.ui.admin.config.SelectDataUI; import fr.ird.observe.application.swing.ui.storage.tabs.DataSelectionModel; import fr.ird.observe.application.swing.ui.tree.DataSelectionTreeSelectionModel; @@ -41,7 +38,7 @@ import jaxx.runtime.swing.wizard.ext.WizardState; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.JTree; +import javax.swing.*; import java.beans.PropertyChangeListener; import java.util.Date; import java.util.Set; @@ -131,35 +128,50 @@ public class ConsolidateUIHandler extends AdminTabUIHandler { ConsolidateDataService consolidateDataService = dataSource.newConsolidateDataService(); - ConsolidateTripSeineDataRequest request = new ConsolidateTripSeineDataRequest(); - request.setTripSeineIds(tripIds); - request.setFailIfLenghtWeightParameterNotFound(false); + int nbResults = 0; + int index=0; + int nbTrips = tripIds.size(); - ImmutableSet<ConsolidateTripSeineDataResult> results = consolidateDataService.consolidateTripSeines(request); + for (String tripId : tripIds) { - if (results.isEmpty()) { + ConsolidateTripSeineDataRequest request = new ConsolidateTripSeineDataRequest(); + request.setTripSeineIds(ImmutableSet.of(tripId)); + request.setFailIfLenghtWeightParameterNotFound(false); - sendMessage(t("observe.actions.consolidate.message.noChanges")); + sendMessage(t("observe.actions.consolidate.start.trip", ++index, nbTrips, tripId)); - } else { + ImmutableSet<ConsolidateTripSeineDataResult> results = consolidateDataService.consolidateTripSeines(request); - for (ConsolidateTripSeineDataResult tripSeineDataResult : results) { + ObserveRunner.cleanMemory(); - String tripSeineLabel = tripSeineDataResult.getTripSeineLabel(); + nbResults+=results.size(); - sendMessage(t("observe.actions.consolidate.message.trip", tripSeineLabel)); + if (results.isEmpty()) { - for (ConsolidateActivitySeineDataResult activitySeineDataResult : tripSeineDataResult.getConsolidateActivitySeineDataResults()) { + sendMessage(t("observe.actions.consolidate.message.noChanges")); - sendMessage(t("observe.actions.consolidate.message.activity", activitySeineDataResult.getActivitySeineLabel())); + } + else { + for (ConsolidateTripSeineDataResult tripSeineDataResult : results) { - } + String tripSeineLabel = tripSeineDataResult.getTripSeineLabel(); + + sendMessage(t("observe.actions.consolidate.message.trip", tripSeineLabel)); + + for (ConsolidateActivitySeineDataResult activitySeineDataResult : tripSeineDataResult.getConsolidateActivitySeineDataResults()) { + + sendMessage(t("observe.actions.consolidate.message.activity", activitySeineDataResult.getActivitySeineLabel())); + } + + } } - sendMessage(t("observe.actions.consolidate.message.save.changes", results.size())); } + sendMessage(t("observe.actions.consolidate.message.save.changes", nbResults)); + + sendMessage(t("observe.actions.consolidate.message.operation.done", new Date())); } ===================================== application-swing/src/main/resources/i18n/application-swing_en_GB.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties +++ b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties @@ -143,6 +143,7 @@ observe.actions.consolidate.message.noChanges=No data modified. observe.actions.consolidate.message.operation.done=Consolidate operation done in %1$s. observe.actions.consolidate.message.save.changes=Save modified %1$s trip(s). observe.actions.consolidate.message.trip=Data consolidate for trip %1$s +observe.actions.consolidate.start.trip=Start consolidate data on trip %s / %s (%s) observe.actions.consolidate.title=Consolidate data observe.actions.consolidate.title.tip=Consolidate observed data observe.actions.exportData=Export data ===================================== application-swing/src/main/resources/i18n/application-swing_es_ES.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties +++ b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties @@ -143,6 +143,7 @@ observe.actions.consolidate.message.noChanges=No modificación de datos. observe.actions.consolidate.message.operation.done=Operación de calculo de datos terminada en %1$s. observe.actions.consolidate.message.save.changes=Guardar las modificaciones de la(s) %1$s marea(s) modificada(s). observe.actions.consolidate.message.trip=Datos calculados para la marea %1$s +observe.actions.consolidate.start.trip=Démarrage de la consolidation pour la marée %s / %s (%s) \#TODO observe.actions.consolidate.title=Consolidar los datos observados observe.actions.consolidate.title.tip=Consolidar los datos observados observe.actions.exportData=Exportar los datos observados ===================================== application-swing/src/main/resources/i18n/application-swing_fr_FR.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties +++ b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties @@ -143,6 +143,7 @@ observe.actions.consolidate.message.noChanges=Aucune donnée modifiée. observe.actions.consolidate.message.operation.done=Opération de calcul des données terminée à %1$s. observe.actions.consolidate.message.save.changes=Sauvegarde des modifications sur la(es) %1$s marée(s) modifiée(s). observe.actions.consolidate.message.trip=Données calculées pour la marée %1$s +observe.actions.consolidate.start.trip=Démarrage de la consolidation pour la marée %s / %s (%s) observe.actions.consolidate.title=Consolider les données observateur observe.actions.consolidate.title.tip=Consolider les données observateur observe.actions.exportData=Exporter les données observateurs View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/ef5095cd0319556b9ef97361b5…

1 0

[Git][ultreia.io/ird-observe][develop-5.x] 3 commits: mettre dans le même ordre les binders et les décorateurs (See #737)
by Tony CHEMIT 03 Mar '17

03 Mar '17

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: c1cb277f by Tony CHEMIT at 2017-03-02T18:20:51+01:00 mettre dans le même ordre les binders et les décorateurs (See #737) - - - - - 07ea97e9 by Tony CHEMIT at 2017-03-03T14:06:47+01:00 Correction de la valeur non déclanchée lors du changement de section (See #740) - - - - - 26afb510 by Tony CHEMIT at 2017-03-03T14:07:37+01:00 section mal recopiée par hibernate (See #737) - - - - - 7 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss - pom.xml - + services-dto/src/main/java/fr/ird/observe/services/dto/longline/CatchLonglineDto.java - services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java - services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BasketBinder.java - services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BranchlineBinder.java - services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SectionBinder.java Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss @@ -73,6 +73,7 @@ #section { property:{CatchLonglineDto.PROPERTY_SECTION}; selectedItem:{tableEditBean.getSection()}; + force:true; _listNoLoad:{true}; } ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -169,7 +169,7 @@ <eugenePluginVersion>3.0-alpha-10</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> - <jaxxVersion>2.40</jaxxVersion> + <jaxxVersion>2.41</jaxxVersion> <nuitonI18nVersion>3.6.3</nuitonI18nVersion> <nuitonConfigVersion>3.2</nuitonConfigVersion> <topiaVersion>3.2.1</topiaVersion> ===================================== services-dto/src/main/java/fr/ird/observe/services/dto/longline/CatchLonglineDto.java ===================================== --- /dev/null +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/longline/CatchLonglineDto.java @@ -0,0 +1,39 @@ +package fr.ird.observe.services.dto.longline; + +/*- + * #%L + * ObServe :: Services DTO + * %% + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ird.observe.services.dto.DataReference; + +import javax.annotation.Generated; + +@Generated(value = "org.nuiton.eugene.java.BeanTransformer", date = "Wed Mar 01 18:04:05 CET 2017") +public class CatchLonglineDto extends GeneratedCatchLonglineDto { + + + public void setSection(DataReference<SectionDto> section) { + super.setSection(section); + System.out.println("WTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTF ???? to section: "+section); + } + + private static final long serialVersionUID = 3846975004402399536L; +} //CatchLonglineDto ===================================== services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java ===================================== --- a/services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java @@ -200,25 +200,25 @@ public enum DataReferenceSetDefinitions { .addProperty(String.class, SetLonglineDto.PROPERTY_HOME_ID)), SECTION(newDefinitionBuilder(SectionDto.class) - .addProperty(Integer.class, SectionDto.PROPERTY_HAULING_IDENTIFIER) - .addProperty(Integer.class, SectionDto.PROPERTY_SETTING_IDENTIFIER)), + .addProperty(Integer.class, SectionDto.PROPERTY_SETTING_IDENTIFIER) + .addProperty(Integer.class, SectionDto.PROPERTY_HAULING_IDENTIFIER)), BASKET(newDefinitionBuilder(BasketDto.class) - .addProperty(Integer.class, BasketDto.PROPERTY_HAULING_IDENTIFIER) - .addProperty(Integer.class, BasketDto.PROPERTY_SETTING_IDENTIFIER)), + .addProperty(Integer.class, BasketDto.PROPERTY_SETTING_IDENTIFIER) + .addProperty(Integer.class, BasketDto.PROPERTY_HAULING_IDENTIFIER)), BRANCHLINE(newDefinitionBuilder(BranchlineDto.class) - .addProperty(Integer.class, BranchlineDto.PROPERTY_HAULING_IDENTIFIER) - .addProperty(Integer.class, BranchlineDto.PROPERTY_SETTING_IDENTIFIER)), + .addProperty(Integer.class, BranchlineDto.PROPERTY_SETTING_IDENTIFIER) + .addProperty(Integer.class, BranchlineDto.PROPERTY_HAULING_IDENTIFIER)), BASKET_WITH_SECTION(newDefinitionBuilder(BasketWithSectionIdDto.class) - .addProperty(Integer.class, BasketWithSectionIdDto.PROPERTY_HAULING_IDENTIFIER) .addProperty(Integer.class, BasketWithSectionIdDto.PROPERTY_SETTING_IDENTIFIER) + .addProperty(Integer.class, BasketWithSectionIdDto.PROPERTY_HAULING_IDENTIFIER) .addProperty(String.class, BasketWithSectionIdDto.PROPERTY_SECTION_ID)), BRANCHLINE_WITH_BASKET(newDefinitionBuilder(BranchlineWithBasketIdDto.class) - .addProperty(Integer.class, BranchlineWithBasketIdDto.PROPERTY_HAULING_IDENTIFIER) .addProperty(Integer.class, BranchlineWithBasketIdDto.PROPERTY_SETTING_IDENTIFIER) + .addProperty(Integer.class, BranchlineWithBasketIdDto.PROPERTY_HAULING_IDENTIFIER) .addProperty(String.class, BranchlineWithBasketIdDto.PROPERTY_BASKET_ID)), FLOATLINES_COMPOSITION(newDefinitionBuilder(FloatlinesCompositionDto.class) ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BasketBinder.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BasketBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BasketBinder.java @@ -69,14 +69,14 @@ public class BasketBinder extends DataBinderSupport<Basket, BasketDto> { @Override public DataReference<BasketDto> toDataReference(ReferentialLocale referentialLocale, Basket entity) { - return toDataReference(entity, entity.getHaulingIdentifier(), entity.getSettingIdentifier()); + return toDataReference(entity, entity.getSettingIdentifier(), entity.getHaulingIdentifier()); } @Override public DataReference<BasketDto> toDataReference(ReferentialLocale referentialLocale, BasketDto dto) { - return toDataReference(dto, dto.getHaulingIdentifier(), dto.getSettingIdentifier()); + return toDataReference(dto, dto.getSettingIdentifier(), dto.getHaulingIdentifier()); } } ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BranchlineBinder.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BranchlineBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BranchlineBinder.java @@ -115,14 +115,14 @@ public class BranchlineBinder extends DataBinderSupport<Branchline, BranchlineDt @Override public DataReference<BranchlineDto> toDataReference(ReferentialLocale referentialLocale, Branchline entity) { - return toDataReference(entity, entity.getHaulingIdentifier(), entity.getSettingIdentifier()); + return toDataReference(entity, entity.getSettingIdentifier(), entity.getHaulingIdentifier()); } @Override public DataReference<BranchlineDto> toDataReference(ReferentialLocale referentialLocale, BranchlineDto dto) { - return toDataReference(dto, dto.getHaulingIdentifier(), dto.getSettingIdentifier()); + return toDataReference(dto, dto.getSettingIdentifier(), dto.getHaulingIdentifier()); } } ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SectionBinder.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SectionBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SectionBinder.java @@ -65,14 +65,18 @@ public class SectionBinder extends DataBinderSupport<Section, SectionDto> { @Override public DataReference<SectionDto> toDataReference(ReferentialLocale referentialLocale, Section entity) { - return toDataReference(entity, entity.getHaulingIdentifier(), entity.getSettingIdentifier()); + //FIXME-tchemit Je ne sais pas pourquoi mais si on utilise ces deux variables inline + //FIXME-tchemit alors les valeurs sont inversées!!! pb proxy hibernate + Integer settingIdentifier = entity.getSettingIdentifier(); + Integer haulingIdentifier = entity.getHaulingIdentifier(); + return toDataReference(entity, settingIdentifier, haulingIdentifier); } @Override public DataReference<SectionDto> toDataReference(ReferentialLocale referentialLocale, SectionDto dto) { - return toDataReference(dto, dto.getHaulingIdentifier(), dto.getSettingIdentifier()); + return toDataReference(dto, dto.getSettingIdentifier(), dto.getHaulingIdentifier()); } } View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/a6591545b50f649be57d9775a…

1 0

[Git][ultreia.io/ird-observe][develop-5.x] fix site build [skip ci]
by Tony CHEMIT 02 Mar '17

02 Mar '17

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: a6591545 by Tony CHEMIT at 2017-03-02T16:02:53+01:00 fix site build [skip ci] - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -921,7 +921,7 @@ </reportSet> </reportSets> <configuration> - <i18nBundleName>${projectId}-i18n</i18nBundleName> + <i18nBundleName>observe-i18n</i18nBundleName> </configuration> </plugin> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/a6591545b50f649be57d9775a4…

1 0

[Git][ultreia.io/ird-observe][develop-5.x] fix builds [skip ci]
by Tony CHEMIT 02 Mar '17

02 Mar '17

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: 777ace02 by Tony CHEMIT at 2017-03-02T15:46:00+01:00 fix builds [skip ci] - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -58,7 +58,7 @@ stages: stage: Test script: - mvn -Padd-git-commit-id-to-project-version -N - - mvn install -am -p application-web -DskipTests -Pdeploy-demo -Dclassifier=latest + - mvn install -am -pl application-web -DskipTests -Pdeploy-demo -Dclassifier=latest build: stage: Build @@ -85,7 +85,7 @@ stage: <<: *test_manual <<: *before_script_clone script: - - apt-get install libc6:i386 libstdc++6:i386 -y + - apt-get update -y && apt-get install libc6-i386 libx32stdc++6 -y - . ~/env/bin/stage.sh "$MASTER" "$DEVELOP" "$STAGE" latest-site: @@ -132,7 +132,7 @@ nightly-demo: staging-demo: <<: *staging script: - - mvn install -am -p application-web -DskipTests -Pdeploy-demo -DperformRelease + - mvn install -am -pl application-web -DskipTests -Pdeploy-demo -DperformRelease staging-site: <<: *staging View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/777ace02ace09c280580564396…

1 0

[Git][ultreia.io/ird-observe][develop-5.x] optimize dependencies [skip ci]
by Tony CHEMIT 02 Mar '17

02 Mar '17

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: 9fd7dd08 by Tony CHEMIT at 2017-03-02T15:05:22+01:00 optimize dependencies [skip ci] - - - - - 2 changed files: - application-swing/pom.xml - pom.xml Changes: ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -569,6 +569,10 @@ <groupId>com.vladsch.flexmark</groupId> <artifactId>flexmark</artifactId> </dependency> + <dependency> + <groupId>com.vladsch.flexmark</groupId> + <artifactId>flexmark-util</artifactId> + </dependency>  <dependency> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -730,6 +730,11 @@ <artifactId>flexmark</artifactId> <version>0.15.4</version> </dependency> + <dependency> + <groupId>com.vladsch.flexmark</groupId> + <artifactId>flexmark-util</artifactId> + <version>0.15.4</version> + </dependency> <dependency> <groupId>org.javassist</groupId> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/9fd7dd080c47facbc34593df39…

1 0

[Git][ultreia.io/ird-observe][develop-5.x] fix release build [skip ci]
by Tony CHEMIT 02 Mar '17

02 Mar '17

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: 4c53157a by Tony CHEMIT at 2017-03-02T14:37:20+01:00 fix release build [skip ci] - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -107,7 +107,7 @@ nightly-build: stage: Build <<: *nightly script: - - apt-get update -y && apt-get install libc6:i386 libstdc++6:i386 -y + - apt-get update -y && apt-get install libc6-i386 libx32stdc++6 -y - mvn clean verify -DperformRelease nightly-site: View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/4c53157a3b33a5b34ee0c813f9…

1 0

[Git][ultreia.io/ird-observe][develop-5.x] fix release build [skip ci]
by Tony CHEMIT 02 Mar '17

02 Mar '17

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: 65e55e77 by Tony CHEMIT at 2017-03-02T12:17:33+01:00 fix release build [skip ci] - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -107,7 +107,7 @@ nightly-build: stage: Build <<: *nightly script: - - apt-get install libc6:i386 libstdc++6:i386 -y + - apt-get update -y && apt-get install libc6:i386 libstdc++6:i386 -y - mvn clean verify -DperformRelease nightly-site: View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/65e55e77ce04d2a27879d16e45…

1 0

[Git][ultreia.io/ird-observe][develop-5.x] fix release build
by Tony CHEMIT 02 Mar '17

02 Mar '17

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: 82e6592a by Tony CHEMIT at 2017-03-02T11:56:37+01:00 fix release build - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -85,6 +85,7 @@ stage: <<: *test_manual <<: *before_script_clone script: + - apt-get install libc6:i386 libstdc++6:i386 -y - . ~/env/bin/stage.sh "$MASTER" "$DEVELOP" "$STAGE" latest-site: @@ -106,6 +107,7 @@ nightly-build: stage: Build <<: *nightly script: + - apt-get install libc6:i386 libstdc++6:i386 -y - mvn clean verify -DperformRelease nightly-site: @@ -130,7 +132,7 @@ nightly-demo: staging-demo: <<: *staging script: - - mvn install -am -p application-web -DskipTests -Pdeploy-demo + - mvn install -am -p application-web -DskipTests -Pdeploy-demo -DperformRelease staging-site: <<: *staging View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/82e6592aa71973dd76068311bc…

1 0