Fixes #5 Update for ospsuite 11 (#6)

* Fixes #5 Update for ospsuite 11 * Fixes #5 Update for ospsuite 11 Co-authored-by: Yuri05 <Yuri05@github.com>
Open-Systems-Pharmacology · May 20, 2022 · 0f7fea2 · 0f7fea2
1 parent 28e76af
commit 0f7fea2
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 3 deletions.
diff --git a/.github/workflows/Dockerfile b/.github/workflows/Dockerfile
@@ -9,6 +9,7 @@ ARG os_version
 ARG tlf_version
 ARG ospsuite_r_version
 ARG rclr_version
+ARG ospsuiteutils_version
 
 ENTRYPOINT ["sh"]
 
@@ -18,8 +19,11 @@ COPY .github/workflows/*.R /tmp_setup/
 COPY .github/workflows/*.sh /tmp_setup/
 RUN chmod ugo+x /tmp_setup/*.sh
 
+# Install CRAN packages
+RUN R --no-save -e "source('/tmp_setup/install_packages.R')"
+
 # Install OSP R packages
-RUN /tmp_setup/install_packages_r${r_version}_${os_version}.sh ${rclr_version} ${tlf_version} ${ospsuite_r_version} 
+RUN /tmp_setup/install_packages_r${r_version}_${os_version}.sh ${rclr_version} ${tlf_version} ${ospsuite_r_version} ${ospsuiteutils_version} 
 
 # Cleanup
 RUN rm -rf /tmp_setup

diff --git a/.github/workflows/LinuxImages.yml b/.github/workflows/LinuxImages.yml
@@ -14,8 +14,9 @@ jobs:
     runs-on: ubuntu-latest
     env:
         RCLR_VERSION: 0.9.1
-        TLF_VERSION: 1.2.5
-        OSPSUITE_R_VERSION: 10.0.72
+        TLF_VERSION: 1.3.66
+        OSPSUITE_R_VERSION: 11.0.123
+        OSPSUITE_UTILS_VERSION: 1.3.17
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -36,6 +37,7 @@ jobs:
             ospsuite_r_version=${{ env.OSPSUITE_R_VERSION }}
             tlf_version=${{ env.TLF_VERSION }}
             rclr_version=${{ env.RCLR_VERSION }}
+            ospsuiteutils_version=${{ env.OSPSUITE_UTILS_VERSION }}
           push: ${{ github.event_name == 'release' }}
           tags: |
             ghcr.io/open-systems-pharmacology/ospsuite-r${{ matrix.r_version }}-${{ matrix.os_version }}:latest

diff --git a/.github/workflows/install_packages.R b/.github/workflows/install_packages.R
@@ -0,0 +1 @@
+install.packages(c('patchwork', 'dplyr', 'purrr', 'tidyr'), repos='http://cran.rstudio.com/')
diff --git a/.github/workflows/install_packages_r3.6.3_bionic.sh b/.github/workflows/install_packages_r3.6.3_bionic.sh
@@ -1,11 +1,13 @@
 #!/bin/sh
 
 # Get software 
+wget -nv https://github.com/Open-Systems-Pharmacology/OSPSuite.RUtils/releases/download/v$4/ospsuite.utils_$4.tar.gz -P /tmp_setup/
 wget -nv https://github.com/Open-Systems-Pharmacology/rClr/releases/download/v$1-R3/R3_rClr_$1_Ubuntu18.tar.gz -P /tmp_setup/
 wget -nv https://github.com/Open-Systems-Pharmacology/TLF-Library/releases/download/v$2/tlf_$2.tar.gz -P /tmp_setup/
 wget -nv https://github.com/Open-Systems-Pharmacology/OSPSuite-R/releases/download/v$3/ospsuite_$3_ubuntu18.tar.gz -P /tmp_setup/
 
 # Install packages
+R CMD INSTALL /tmp_setup/ospsuite.utils_$4.tar.gz --install-tests && \
 R CMD INSTALL /tmp_setup/R3_rClr_$1_Ubuntu18.tar.gz --install-tests && \
 R CMD INSTALL /tmp_setup/tlf_$2.tar.gz --install-tests && \
 R CMD INSTALL /tmp_setup/ospsuite_$3_ubuntu18.tar.gz --install-tests
diff --git a/.github/workflows/install_packages_r3.6.3_centos7.sh b/.github/workflows/install_packages_r3.6.3_centos7.sh
@@ -1,11 +1,13 @@
 #!/bin/sh
 
 # Get software 
+wget -nv https://github.com/Open-Systems-Pharmacology/OSPSuite.RUtils/releases/download/v$4/ospsuite.utils_$4.tar.gz -P /tmp_setup/
 wget -nv https://github.com/Open-Systems-Pharmacology/rClr/releases/download/v$1-R3/R3_rClr_$1_CentOS7.tar.gz -P /tmp_setup/
 wget -nv https://github.com/Open-Systems-Pharmacology/TLF-Library/releases/download/v$2/tlf_$2.tar.gz -P /tmp_setup/
 wget -nv https://github.com/Open-Systems-Pharmacology/OSPSuite-R/releases/download/v$3/ospsuite_$3_centOS7.tar.gz -P /tmp_setup/
 
 # Install packages
+R CMD INSTALL /tmp_setup/ospsuite.utils_$4.tar.gz --install-tests && \
 R CMD INSTALL /tmp_setup/R3_rClr_$1_CentOS7.tar.gz --install-tests && \
 R CMD INSTALL /tmp_setup/tlf_$2.tar.gz --install-tests && \
 R CMD INSTALL /tmp_setup/ospsuite_$3_centOS7.tar.gz --install-tests
diff --git a/.github/workflows/install_packages_r4.1.0_bionic.sh b/.github/workflows/install_packages_r4.1.0_bionic.sh
@@ -1,11 +1,13 @@
 #!/bin/sh
 
 # Get software 
+wget -nv https://github.com/Open-Systems-Pharmacology/OSPSuite.RUtils/releases/download/v$4/ospsuite.utils_$4.tar.gz -P /tmp_setup/
 wget -nv https://github.com/Open-Systems-Pharmacology/rClr/releases/download/v$1/R4_rClr_$1_Ubuntu18.tar.gz -P /tmp_setup/
 wget -nv https://github.com/Open-Systems-Pharmacology/TLF-Library/releases/download/v$2/tlf_$2.tar.gz -P /tmp_setup/
 wget -nv https://github.com/Open-Systems-Pharmacology/OSPSuite-R/releases/download/v$3/ospsuite_$3_ubuntu18.tar.gz -P /tmp_setup/
 
 # Install packages
+R CMD INSTALL /tmp_setup/ospsuite.utils_$4.tar.gz --install-tests && \
 R CMD INSTALL /tmp_setup/R4_rClr_$1_Ubuntu18.tar.gz --install-tests && \
 R CMD INSTALL /tmp_setup/tlf_$2.tar.gz --install-tests && \
 R CMD INSTALL /tmp_setup/ospsuite_$3_ubuntu18.tar.gz --install-tests
diff --git a/.github/workflows/install_packages_r4.1.0_centos7.sh b/.github/workflows/install_packages_r4.1.0_centos7.sh
@@ -1,11 +1,14 @@
 #!/bin/sh
 
 # Get software 
+wget -nv https://github.com/Open-Systems-Pharmacology/OSPSuite.RUtils/releases/download/v$4/ospsuite.utils_$4.tar.gz -P /tmp_setup/
 wget -nv https://github.com/Open-Systems-Pharmacology/rClr/releases/download/v$1/R4_rClr_$1_CentOS7.tar.gz -P /tmp_setup/
 wget -nv https://github.com/Open-Systems-Pharmacology/TLF-Library/releases/download/v$2/tlf_$2.tar.gz -P /tmp_setup/
 wget -nv https://github.com/Open-Systems-Pharmacology/OSPSuite-R/releases/download/v$3/ospsuite_$3_centOS7.tar.gz -P /tmp_setup/
 
+
 # Install packages
+R CMD INSTALL /tmp_setup/ospsuite.utils_$4.tar.gz --install-tests && \
 R CMD INSTALL /tmp_setup/R4_rClr_$1_CentOS7.tar.gz --install-tests && \
 R CMD INSTALL /tmp_setup/tlf_$2.tar.gz --install-tests && \
 R CMD INSTALL /tmp_setup/ospsuite_$3_centOS7.tar.gz --install-tests