Skip to content

Commit

Permalink
ci: revert to using the frontend plugin to bundle apps (#18624)
Browse files Browse the repository at this point in the history 
* Revert "ci: activate the local profile when CI=false and absent (#18617)"

This reverts commit 04d61e1.

* Revert "ci: use existing node installation on CI (#18612)"

This reverts commit 6bfad31.
  • Loading branch information
@teleivo
teleivo authored Sep 19, 2024
1 parent 04d61e1 commit 59a289f
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 109 deletions.
141 changes: 45 additions & 96 deletions dhis-2/dhis-web-apps/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,107 +26,56 @@

<build>
<finalName>dhis-web-apps</finalName>
</build>

<profiles>
<!-- nodejs is downloaded locally to clone bundled apps -->
<profile>
<id>local</id>
<activation>
<property>
<name>!env.CI</name>
<!-- Activates when CI is not defined or false -->
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<version>1.15.0</version>
<plugins>
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<version>1.15.0</version>
<configuration>
<installDirectory>target</installDirectory>
<environmentVariables>
<BUILD_DIR>${project.build.directory}</BUILD_DIR>
<ARTIFACT_ID>${project.artifactId}</ARTIFACT_ID>
<APPS>./apps-to-bundle.json</APPS>
<DEFAULT_BRANCH>master</DEFAULT_BRANCH>
</environmentVariables>
</configuration>
<executions>

<execution>
<id>install node and npm</id>
<goals>
<goal>install-node-and-npm</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
<installDirectory>target</installDirectory>
<environmentVariables>
<BUILD_DIR>${project.build.directory}</BUILD_DIR>
<ARTIFACT_ID>${project.artifactId}</ARTIFACT_ID>
<APPS>./apps-to-bundle.json</APPS>
<DEFAULT_BRANCH>master</DEFAULT_BRANCH>
</environmentVariables>
<nodeVersion>v16.13.2</nodeVersion>
</configuration>
<executions>
<execution>
<id>install node and npm</id>
<goals>
<goal>install-node-and-npm</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
<nodeVersion>v20.17.0</nodeVersion>
</configuration>
</execution>
</execution>

<execution>
<id>npm install</id>
<goals>
<goal>npm</goal>
</goals>
<phase>generate-resources</phase>
</execution>
<execution>
<id>npm install</id>
<goals>
<goal>npm</goal>
</goals>
<phase>generate-resources</phase>
</execution>

<execution>
<id>bundle-apps</id>
<goals>
<goal>npm</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
<arguments>run bundle-apps</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<!-- nodejs is present on CI (GitHub, Jenkins) to clone bundled apps -->
<profile>
<id>ci</id>
<activation>
<property>
<name>env.CI</name>
<value>true</value>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<execution>
<id>clone apps</id>
<goals>
<goal>npm</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
<executable>npm</executable>
<arguments>
<argument>run</argument>
<argument>bundle-apps</argument>
</arguments>
<environmentVariables>
<BUILD_DIR>${project.build.directory}</BUILD_DIR>
<ARTIFACT_ID>${project.artifactId}</ARTIFACT_ID>
<APPS>./apps-to-bundle.json</APPS>
<DEFAULT_BRANCH>master</DEFAULT_BRANCH>
</environmentVariables>
<arguments>run bundle-apps</arguments>
</configuration>
<executions>
<execution>
<id>bundle-apps</id>
<goals>
<goal>exec</goal>
</goals>
<phase>package</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</execution>

</executions>
</plugin>

</plugins>
</build>
</project>
21 changes: 8 additions & 13 deletions dhis-2/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@

<description>DHIS2 is a free and open-source software platform for collecting, managing, analyzing, and sharing data.
It supports online and offline data capture via web and mobile devices, and includes built-in features for data validation and visualization.
The generic DHIS2 data model supports both routine aggregate/statistical data collection and individual/event data, and can be applied to use cases in any sector, allowing decentralized access to data throughout an organizational hierarchy.
The generic DHIS2 data model supports both routine aggregate/statistical data collection and individual/event data, a
nd can be applied to use cases in any sector, allowing decentralized access to data throughout an organizational hierarchy.
DHIS2 is fully customizable through the user interface without the need for coding skills,
and can be extended with custom applications, scripts, and integrations.
Each DHIS2 instance and the data stored within it are locally owned and managed.
Expand Down Expand Up @@ -59,7 +60,7 @@
<properties>
<!-- Build Properties -->
<rootDir/>
<!-- Custom source directory property, as <build><sourceDirectory> cannot
<!-- Custom source directory property, as <build><sourceDirectory> cannot
be set in a profile. See https://github.com/awhitford/lombok.maven/issues/17#issuecomment-136606104 -->
<sourceDir>${project.basedir}/src/main/java</sourceDir>

Expand All @@ -73,7 +74,7 @@
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
<surefireArgLine>-Xmx2024m</surefireArgLine>

<!-- Needed so we can disable running tests when the default profile
<!-- Needed so we can disable running tests when the default profile
is used (activated by default). It does not honor -DskipTests otherwise https://maven.apache.org/surefire/maven-surefire-plugin/examples/skipping-tests.html -->
<skipTests>false</skipTests>

Expand Down Expand Up @@ -235,7 +236,6 @@
<!-- Maven plugin versions -->
<maven-surefire-plugin.version>3.4.0</maven-surefire-plugin.version>
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
<maven-exec-plugin.version>3.4.1</maven-exec-plugin.version>
<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
<maven-failsafe-plugin.version>3.5.0</maven-failsafe-plugin.version>
<maven-javadoc-plugin.version>3.10.0</maven-javadoc-plugin.version>
Expand Down Expand Up @@ -1667,8 +1667,8 @@
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
<!-- Depend only on mockito-inline (includes mockito-core already)
if you must use mockStatic (can you rewrite your code, so it's not necessary
<!-- Depend only on mockito-inline (includes mockito-core already)
if you must use mockStatic (can you rewrite your code, so it's not necessary
;)), otherwise depend on mockito-core only -->
<dependency>
<groupId>org.mockito</groupId>
Expand Down Expand Up @@ -1727,9 +1727,9 @@
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
</exclusion>
<!--
<!--
Junit 4 cannot be excluded yet, because of this issue
https://github.com/testcontainers/testcontainers-java/issues/970
https://github.com/testcontainers/testcontainers-java/issues/970
-->
<!--
<exclusion>
Expand Down Expand Up @@ -1918,11 +1918,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>${maven-exec-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
Expand Down

0 comments on commit 59a289f

Please sign in to comment.