Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(feat) Use referenceapplication content package #873

Merged
merged 4 commits into from
Jan 16, 2025
Merged

(feat) Use referenceapplication content package #873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e50ae3e
Use referenceapplication content package
jayasanka-sack Jan 6, 2025
f2af331
Remove extra space
jayasanka-sack Jan 6, 2025
4fa4e1d
Copy config files to the correct directory
jayasanka-sack Jan 16, 2025
58b688f
Run validator in the verify phase
jayasanka-sack Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ jobs:
cache: 'maven'

- name: Build and Test
run: mvn --batch-mode --update-snapshots --activate-profiles distro,validator clean package
run: mvn --batch-mode --update-snapshots --activate-profiles distro,validator clean verify
9 changes: 5 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,12 @@ COPY distro ./distro/
# Build the distro, but only deploy from the amd64 build
RUN --mount=type=secret,id=m2settings,target=/usr/share/maven/ref/settings-docker.xml if [[ "$MVN_ARGS" != "deploy" || "$(arch)" = "x86_64" ]]; then mvn $MVN_ARGS_SETTINGS $MVN_ARGS; else mvn $MVN_ARGS_SETTINGS install; fi

RUN cp /openmrs_distro/distro/target/sdk-distro/web/openmrs.war /openmrs/distribution/openmrs_core/
RUN cp /openmrs_distro/distro/target/sdk-distro/web/openmrs_core/openmrs.war /openmrs/distribution/openmrs_core/

RUN cp /openmrs_distro/distro/target/sdk-distro/web/openmrs-distro.properties /openmrs/distribution/
RUN cp -R /openmrs_distro/distro/target/sdk-distro/web/modules /openmrs/distribution/openmrs_modules
RUN cp -R /openmrs_distro/distro/target/sdk-distro/web/owa /openmrs/distribution/openmrs_owas
RUN cp -R /openmrs_distro/distro/target/sdk-distro/web/openmrs_modules /openmrs/distribution/openmrs_modules/
RUN cp -R /openmrs_distro/distro/target/sdk-distro/web/openmrs_owas /openmrs/distribution/openmrs_owas/
RUN cp -R /openmrs_distro/distro/target/sdk-distro/web/openmrs_config /openmrs/distribution/openmrs_config/

# Clean up after copying needed artifacts
RUN mvn $MVN_ARGS_SETTINGS clean
Expand All @@ -33,4 +34,4 @@ COPY --from=dev /openmrs/distribution/openmrs_core/openmrs.war /openmrs/distribu
COPY --from=dev /openmrs/distribution/openmrs-distro.properties /openmrs/distribution/
COPY --from=dev /openmrs/distribution/openmrs_modules /openmrs/distribution/openmrs_modules
COPY --from=dev /openmrs/distribution/openmrs_owas /openmrs/distribution/openmrs_owas
COPY --from=dev /openmrs_distro/distro/configuration /openmrs/distribution/openmrs_config
COPY --from=dev /openmrs/distribution/openmrs_config /openmrs/distribution/openmrs_config
12 changes: 0 additions & 12 deletions distro/configuration/conceptclasses/conceptclasses-core_data.csv
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions distro/configuration/conceptsources/conceptsources-core_data.csv
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions distro/configuration/fhirconceptsources/fhir_concept_sources-core_data.csv
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions distro/configuration/globalproperties/globalproperties-core_data.xml
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions distro/configuration/locationtags/locationtags-core_demo.csv
View file
Open in desktop

This file was deleted.

Binary file removed ...o/configuration/ocl/openmrs_CIELImmunizationContent_v9_autoexpand-9.2023-10-29_230040.zip
View file
Open in desktop
Binary file not shown.
Binary file removed distro/configuration/ocl/openmrs_PD_v7_autoexpand-7.2024-06-04_200232.zip
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions distro/distro.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,4 @@ omod.event=${event.version}
omod.bedmanagement=${bedmanagement.version}
omod.stockmanagement=${stockmanagement.version}
omod.billing=${billing.version}
content.referenceapplication=1.0.0-SNAPSHOT
7 changes: 5 additions & 2 deletions distro/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@
<phase>package</phase>
<configuration>
<target>
<copy todir="${project.build.directory}/openmrs_config">
<copy todir="${project.build.directory}/sdk-distro/web/openmrs_config">
<fileset dir="${project.basedir}/configuration"/>
</copy>
</target>
Expand Down Expand Up @@ -329,10 +329,13 @@
<executions>
<execution>
<id>validate-configurations</id>
<phase>validate</phase>
<phase>verify</phase>
<goals>
<goal>validate-configurations</goal>
</goals>
<configuration>
<sourceDir>${project.build.directory}/sdk-distro/web/openmrs_config</sourceDir>
</configuration>
</execution>
</executions>
</plugin>
Expand Down
3 changes: 2 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,8 @@
<plugin>
<groupId>org.openmrs.maven.plugins</groupId>
<artifactId>openmrs-sdk-maven-plugin</artifactId>
<version>5.15.0</version>
<version>6.1.0-SNAPSHOT</version>

</plugin>
<plugin>
<groupId>org.openmrs.maven.plugins</groupId>
Expand Down
Loading