Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: open-osp/open-osp
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: MagentaHealth/open-osp
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 5 commits
  • 3 files changed
  • 2 contributors

Commits on Mar 21, 2024

  1. update war version number to match

    @kk-chung
    kk-chung authored Mar 21, 2024
    Copy the full SHA
    6a5d0c8 View commit details

Commits on Apr 5, 2024

  1. adjusting war filename

    @kk-chung
    kk-chung authored Apr 5, 2024
    Copy the full SHA
    74d747a View commit details

Commits on May 10, 2024

  1. increasing maximum memory allocation for the purpose of building OSCAR

    @kk-chung
    kk-chung authored May 10, 2024
    Copy the full SHA
    183a72d View commit details

Commits on Jul 8, 2024

  1. Merge branch 'open-osp:master' into master

    @lacarmen
    lacarmen authored Jul 8, 2024
    Copy the full SHA
    a5ae645 View commit details

Commits on Jul 9, 2024

  1. Use open-osp build for Ontario as well

    @lacarmen
    lacarmen authored Jul 9, 2024
    Copy the full SHA
    6342690 View commit details
Showing with 2 additions and 6 deletions.
  1. +1 −1 bin/build-oscar.sh
  2. +1 −1 bin/openosp-build.sh
  3. +0 −4 bin/openosp-setup.sh
2 changes: 1 addition & 1 deletion bin/build-oscar.sh
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ cd docker/oscar/oscar

# increase java perm and gen memory for build
# other switches can be added here for debugging the build.
export MAVEN_OPTS="-Xms640m -Xmx640m -Xss512k -XX:NewRatio=4 -Djava.net.preferIPv4Stack=true"
export MAVEN_OPTS="-Xms640m -Xmx960m -Xss512k -XX:NewRatio=4 -Djava.net.preferIPv4Stack=true"

# this repository should have passed unit testing and mvn verify
# on the cis before being built here.
2 changes: 1 addition & 1 deletion bin/openosp-build.sh
View file
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ case $COMPONENT in
if [ -z $WARFILE ]; then
echo "Compiling OSCAR warfile. This may take some time...."
docker compose -f docker-compose.build.yml run --rm builder ./bin/build-oscar.sh
mv $OSCAR_OUTPUT/oscar/target/oscar-*-SNAPSHOT.war $OSCAR_OUTPUT/oscar.war
mv $OSCAR_OUTPUT/oscar/target/oscar-*.war $OSCAR_OUTPUT/oscar.war
else
mkdir -p $OSCAR_OUTPUT
cp $WARFILE $OSCAR_OUTPUT/oscar.war
4 changes: 0 additions & 4 deletions bin/openosp-setup.sh
View file
Original file line number Diff line number Diff line change
@@ -79,10 +79,6 @@ if [ ! -f ./volumes/oscar.properties ]; then
then
echo "Using Ontario properties"
cp docker/oscar/conf/oscar_mcmaster_on.properties ./volumes/oscar.properties

# We also might want to use Oscar19 for Ontario builds
echo "OSCAR_TREEISH=oscar19.1" >> ./local.env
echo "OSCAR_REPO=https://countable@bitbucket.com/oscaremr/oscar.git" >> ./local.env
else
echo "Using default BC properties"
cp docker/oscar/conf/oscar_mcmaster_bc.properties ./volumes/oscar.properties