Skip to content

Commit

Permalink
(release-revert) Reset to dev versions
Browse files Browse the repository at this point in the history
  • Loading branch information
denniskigen authored and ibacher committed Jul 2, 2024
1 parent 31f7632 commit 811c4ed
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 40 deletions.
2 changes: 1 addition & 1 deletion distro/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.openmrs</groupId>
<artifactId>distro-emr</artifactId>
<version>3.0.0</version>
<version>3.1.0-SNAPSHOT</version>
</parent>

<artifactId>distro-emr-configuration</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions frontend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#--------------------------------------------
FROM --platform=$BUILDPLATFORM node:18-alpine as dev

ARG APP_SHELL_VERSION=5.6.0
ARG APP_SHELL_VERSION=next

RUN mkdir -p /app
WORKDIR /app
Expand All @@ -13,8 +13,8 @@ COPY spa-assemble-config.json .
COPY spa-build-config.json .

ARG CACHE_BUST
RUN npx --legacy-peer-deps openmrs@${APP_SHELL_VERSION:-5.6.0} assemble --manifest --mode config --config spa-assemble-config.json --target ./spa
RUN npx --legacy-peer-deps openmrs@${APP_SHELL_VERSION:-5.6.0} build --build-config spa-build-config.json --target ./spa
RUN npx --legacy-peer-deps openmrs@${APP_SHELL_VERSION:-next} assemble --manifest --mode config --config spa-assemble-config.json --target ./spa
RUN npx --legacy-peer-deps openmrs@${APP_SHELL_VERSION:-next} build --build-config spa-build-config.json --target ./spa
RUN if [ ! -f ./spa/index.html ]; then echo 'Build failed. Please check the logs above for details. This may have happened because of an update to a library that OpenMRS depends on.'; exit 1; fi

#--------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion frontend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.openmrs</groupId>
<artifactId>distro-emr</artifactId>
<version>3.0.0</version>
<version>3.1.0-SNAPSHOT</version>
</parent>

<artifactId>distro-emr-frontend</artifactId>
Expand Down
69 changes: 35 additions & 34 deletions frontend/spa-assemble-config.json
Original file line number Diff line number Diff line change
@@ -1,39 +1,40 @@
{
"frontendModules": {
"@openmrs/esm-active-visits-app": "7.0.0",
"@openmrs/esm-appointments-app": "7.0.0",
"@openmrs/esm-cohort-builder-app": "4.0.0",
"@openmrs/esm-devtools-app": "5.6.0",
"@openmrs/esm-dispensing-app": "1.3.2",
"@openmrs/esm-fast-data-entry-app": "1.0.0",
"@openmrs/esm-form-builder-app": "2.5.0",
"@openmrs/esm-form-engine-app": "8.0.0",
"@openmrs/esm-generic-patient-widgets-app": "8.0.0",
"@openmrs/esm-home-app": "5.3.0",
"@openmrs/esm-implementer-tools-app": "5.6.0",
"@openmrs/esm-login-app": "5.6.0",
"@openmrs/esm-openconceptlab-app": "4.0.3",
"@openmrs/esm-patient-allergies-app": "8.0.0",
"@openmrs/esm-patient-attachments-app": "8.0.0",
"@openmrs/esm-patient-banner-app": "8.0.0",
"@openmrs/esm-patient-chart-app": "8.0.0",
"@openmrs/esm-patient-conditions-app": "8.0.0",
"@openmrs/esm-patient-flags-app": "8.0.0",
"@openmrs/esm-patient-forms-app": "8.0.0",
"@openmrs/esm-patient-immunizations-app": "8.0.0",
"@openmrs/esm-patient-labs-app": "8.0.0",
"@openmrs/esm-patient-list-management-app": "7.0.0",
"@openmrs/esm-patient-lists-app": "8.0.0",
"@openmrs/esm-patient-medications-app": "8.0.0",
"@openmrs/esm-patient-notes-app": "8.0.0",
"@openmrs/esm-patient-orders-app": "8.0.0",
"@openmrs/esm-patient-programs-app": "8.0.0",
"@openmrs/esm-patient-registration-app": "7.0.0",
"@openmrs/esm-patient-search-app": "7.0.0",
"@openmrs/esm-patient-vitals-app": "8.0.0",
"@openmrs/esm-primary-navigation-app": "5.6.0",
"@openmrs/esm-service-queues-app": "7.0.0",
"@openmrs/esm-system-admin-app": "4.0.3"
"@openmrs/esm-active-visits-app": "next",
"@openmrs/esm-appointments-app": "next",
"@openmrs/esm-cohort-builder-app": "next",
"@openmrs/esm-devtools-app": "next",
"@openmrs/esm-dispensing-app": "next",
"@openmrs/esm-fast-data-entry-app": "next",
"@openmrs/esm-form-builder-app": "next",
"@openmrs/esm-form-engine-app": "next",
"@openmrs/esm-generic-patient-widgets-app": "next",
"@openmrs/esm-home-app": "next",
"@openmrs/esm-implementer-tools-app": "next",
"@openmrs/esm-laboratory-app": "next",
"@openmrs/esm-login-app": "next",
"@openmrs/esm-openconceptlab-app": "next",
"@openmrs/esm-patient-allergies-app": "next",
"@openmrs/esm-patient-attachments-app": "next",
"@openmrs/esm-patient-banner-app": "next",
"@openmrs/esm-patient-chart-app": "next",
"@openmrs/esm-patient-conditions-app": "next",
"@openmrs/esm-patient-flags-app": "next",
"@openmrs/esm-patient-forms-app": "next",
"@openmrs/esm-patient-immunizations-app": "next",
"@openmrs/esm-patient-labs-app": "next",
"@openmrs/esm-patient-list-management-app": "next",
"@openmrs/esm-patient-lists-app": "next",
"@openmrs/esm-patient-medications-app": "next",
"@openmrs/esm-patient-notes-app": "next",
"@openmrs/esm-patient-orders-app": "next",
"@openmrs/esm-patient-programs-app": "next",
"@openmrs/esm-patient-registration-app": "next",
"@openmrs/esm-patient-search-app": "next",
"@openmrs/esm-patient-vitals-app": "next",
"@openmrs/esm-primary-navigation-app": "next",
"@openmrs/esm-service-queues-app": "next",
"@openmrs/esm-system-admin-app": "next"
},
"excludedFrontendModules": []
}
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<name>Package and Run OpenMRS</name>
<description>Convenient project to build an OpenMRS distribution and run it</description>

<version>3.0.0</version>
<version>3.1.0-SNAPSHOT</version>
<packaging>pom</packaging>

<organization>
Expand Down

0 comments on commit 811c4ed

Please sign in to comment.