Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions .github/workflows/test-Docker-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,13 @@ jobs:
token: ${{ secrets.PAT_ADD_ISSUES_TO_PROJECT }}
path: pacta.portfolio.analysis

- name: Checkout pacta.portfolio.utils
uses: actions/checkout@v3
with:
repository: RMI-PACTA/pacta.portfolio.utils
token: ${{ secrets.GITHUB_TOKEN }}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this need a token? Isn't the repo public?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will re-visit this later

path: pacta.portfolio.utils

- name: Checkout pacta.interactive.report
uses: actions/checkout@v3
with:
Expand Down
8 changes: 6 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ COPY pacta.executive.summary/DESCRIPTION /pacta.executive.summary/DESCRIPTION
COPY pacta.interactive.report/DESCRIPTION /pacta.interactive.report/DESCRIPTION
COPY pacta.portfolio.analysis/DESCRIPTION /pacta.portfolio.analysis/DESCRIPTION
COPY pacta.portfolio.import/DESCRIPTION /pacta.portfolio.import/DESCRIPTION
COPY pacta.portfolio.utils/DESCRIPTION /pacta.portfolio.utils/DESCRIPTION

# copy in scripts from this repo
COPY workflow.transition.monitor /bound
Expand All @@ -101,7 +102,8 @@ RUN Rscript -e "\
'pacta.executive.summary', \
'pacta.interactive.report', \
'pacta.portfolio.analysis', \
'pacta.portfolio.import' \
'pacta.portfolio.import', \
'pacta.portfolio.utils' \
); \
workflow_pkgs <- renv::dependencies('/bound')[['Package']]; \
workflow_pkgs <- setdiff(workflow_pkgs, local_pkgs); \
Expand All @@ -118,6 +120,7 @@ COPY pacta.executive.summary /pacta.executive.summary
COPY pacta.interactive.report /pacta.interactive.report
COPY pacta.portfolio.analysis /pacta.portfolio.analysis
COPY pacta.portfolio.import /pacta.portfolio.import
COPY pacta.portfolio.utils /pacta.portfolio.utils

# install local R package clones
RUN Rscript -e "\
Expand All @@ -126,7 +129,8 @@ RUN Rscript -e "\
'pacta.executive.summary', \
'pacta.interactive.report', \
'pacta.portfolio.analysis', \
'pacta.portfolio.import' \
'pacta.portfolio.import', \
'pacta.portfolio.utils' \
); \
pak::pkg_install(paste0('local::./', local_pkgs)); \
"
Expand Down
1 change: 1 addition & 0 deletions build/build_with_tag.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ if [ -z "${repos}" ]; then
repos="\
pacta.portfolio.import \
pacta.portfolio.analysis \
pacta.portfolio.utils \
pacta.interactive.report \
pacta.executive.summary \
workflow.transition.monitor \
Expand Down
1 change: 1 addition & 0 deletions web_tool_script_1.R
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
suppressPackageStartupMessages({
library(pacta.portfolio.utils)
library(pacta.portfolio.import)
library(pacta.portfolio.analysis)
library(cli)
Expand Down
1 change: 1 addition & 0 deletions web_tool_script_2.R
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
suppressPackageStartupMessages({
library(pacta.portfolio.utils)
library(pacta.portfolio.analysis)
library(cli)
library(dplyr)
Expand Down
2 changes: 1 addition & 1 deletion web_tool_script_3.R
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
suppressPackageStartupMessages({
library(pacta.portfolio.analysis)
library(pacta.portfolio.utils)
library(pacta.interactive.report)
library(pacta.executive.summary)
library(cli)
Expand Down