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.

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

Refactor/11 convert to package #17

Closed
wants to merge 135 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
135 commits
Select commit Hold shift + click to select a range
5696c65
Add docker action from RMI-PACTA/actions
AlexAxthelm May 28, 2024
d35a897
Remvoe old actions
AlexAxthelm May 28, 2024
c55c309
Update Docker labels
AlexAxthelm May 28, 2024
bf1935f
Clean up sysdep installation
AlexAxthelm May 28, 2024
f8673d8
Simplify dependency installation; add non-root user
AlexAxthelm May 28, 2024
247aab9
Move user creation to just after installing sysdeps
AlexAxthelm May 28, 2024
c010df2
Add DESCRIPTION and other R package skeleton
AlexAxthelm May 28, 2024
c6bab78
Add user to `staff`, allowing R package install
AlexAxthelm May 28, 2024
b5005f5
Use base image with newer CRAN pin date
AlexAxthelm May 28, 2024
fb28331
Add `docker-compose.yml`
AlexAxthelm May 28, 2024
b5e0c27
Run `pak` commands as `root`
AlexAxthelm May 28, 2024
ce149f3
Move non-root user to after package installation
AlexAxthelm May 28, 2024
d8c5e53
toss it, just start fresh, and don't inherit
AlexAxthelm May 28, 2024
8a5951d
Also install pkgdepends
AlexAxthelm May 28, 2024
2f870e3
Move `pak` installation into setup
AlexAxthelm May 29, 2024
4c75a34
Update pin date
AlexAxthelm May 29, 2024
6826015
Use `pka::local_install_deps()`
AlexAxthelm May 29, 2024
98da684
Add `libicu-dev` sysdep
AlexAxthelm May 29, 2024
4280d5f
Reflect new directory structure
AlexAxthelm May 29, 2024
0e8774a
Working build
AlexAxthelm May 29, 2024
aa5f323
add script, lightly modified from `workflow.pacta`
AlexAxthelm May 29, 2024
96cf164
Move main script
AlexAxthelm May 29, 2024
f90ad2e
Call an argumentless function as entrypoint
AlexAxthelm May 29, 2024
345a496
Move main script
AlexAxthelm May 29, 2024
bf286de
Call an argumentless function as entrypoint
AlexAxthelm May 29, 2024
cacf5f5
Add testing configs from workflow.pacta
AlexAxthelm May 29, 2024
628a32b
Import `logger` functions
AlexAxthelm May 29, 2024
1b1da7a
Add run_pacta script
AlexAxthelm May 29, 2024
ce1257b
Call new script from Dockerfile
AlexAxthelm May 29, 2024
cdfba5e
Create dir before `chmod`ding
AlexAxthelm May 29, 2024
88b1175
Update Rbuildignore and dockerignore
AlexAxthelm May 29, 2024
45a58a8
Use import logging functions from package namespace
AlexAxthelm May 29, 2024
1041569
Update upload URL
AlexAxthelm May 29, 2024
b5bccb3
Use default testing portfolio for analysis results
AlexAxthelm May 29, 2024
2b9a7ba
fix line continuation
AlexAxthelm May 29, 2024
f1dd139
Factor utility functions to separate file
AlexAxthelm May 29, 2024
a71202b
Remove TODO
AlexAxthelm May 29, 2024
9d44006
linting
AlexAxthelm May 29, 2024
0d510c0
Remove second `chmod`
AlexAxthelm May 29, 2024
3dadeb2
render Docs
AlexAxthelm May 29, 2024
f558892
import log_debug
AlexAxthelm May 29, 2024
ae8abf0
Add R checks from RMI-PACTA/actions
AlexAxthelm May 29, 2024
2482339
Remove unused variables
AlexAxthelm May 29, 2024
3adcfc8
Report image doesn't need a portfolio mount
AlexAxthelm May 29, 2024
835c087
Remove unused shell script
AlexAxthelm May 29, 2024
8287ae1
Merge commit '2482339' into add-tests
AlexAxthelm May 29, 2024
e9685b3
Namespace functions from `pacta.portfolio.utils`
AlexAxthelm May 29, 2024
6f16d2f
Namespace functions from `pacta.portfolio.report`
AlexAxthelm May 29, 2024
b3b873c
Namespace functions from `pacta.executive.summary`
AlexAxthelm May 29, 2024
96977ac
namespace functions from `jsonlite`
AlexAxthelm May 29, 2024
a6a9d82
Remvoe library call to `fs` and `dplyr`
AlexAxthelm May 29, 2024
ea3caab
Namespace functions from `readr`
AlexAxthelm May 29, 2024
39052da
Namespace functions in utils
AlexAxthelm May 29, 2024
47ee597
Pass arguments to utility functions explicitly
AlexAxthelm May 29, 2024
3f89da1
Add argument to function
AlexAxthelm May 29, 2024
0ab089c
make DESCRIPTION have a complete sentence
AlexAxthelm May 29, 2024
a4d4fdd
rename utility function to snake_case
AlexAxthelm May 29, 2024
f9a4799
Merge branch 'refactor/11-convert-to-package' into add-tests
AlexAxthelm May 29, 2024
1b748dc
add `.lintr`
AlexAxthelm May 29, 2024
8392220
Factor interactive report process to own function
AlexAxthelm May 29, 2024
dc18369
Factor executive summary process into own function
AlexAxthelm May 29, 2024
a51f9c9
Increment version number to 0.0.0.9001
AlexAxthelm May 29, 2024
f3b42b3
Render Docs
AlexAxthelm May 29, 2024
6a45159
Download prepared index benchmarks in tests
AlexAxthelm May 30, 2024
f708562
Fix typo in variable name
AlexAxthelm May 30, 2024
5220008
change default logging level
AlexAxthelm May 30, 2024
2f229f0
Use dev version of dependency
AlexAxthelm May 30, 2024
6ccbaeb
Merge pull request #18 from RMI-PACTA/add-tests
AlexAxthelm May 30, 2024
6453df7
Pass `cfg` to prep functions
AlexAxthelm May 30, 2024
8064bfb
Add benchmark arguments to subfunctions
AlexAxthelm May 30, 2024
e762f2e
Add arguments for missing objects in report
AlexAxthelm May 30, 2024
1b5c223
Add arguments for missing objects in summary
AlexAxthelm May 30, 2024
4f8a071
Update function calls
AlexAxthelm May 30, 2024
000ad13
Linting (indentation)
AlexAxthelm May 30, 2024
a620492
linting (brace)
AlexAxthelm May 30, 2024
abb289b
remove unused variables
AlexAxthelm May 30, 2024
ab56020
Download results from workflow.pacta, not create
AlexAxthelm May 30, 2024
301ff1b
add back in testing step
AlexAxthelm May 30, 2024
4859fe5
Fir envvar reference
AlexAxthelm May 30, 2024
788ab4e
Fix path
AlexAxthelm May 30, 2024
cdc9b94
Don't download full pacta-data
AlexAxthelm May 30, 2024
0964cb7
Fix paths to testing results from `workflow.pacta`
AlexAxthelm May 30, 2024
fbf4c34
Download manifest of `pacta-data`
AlexAxthelm May 30, 2024
a484554
Read pacta data path from test config
AlexAxthelm May 30, 2024
0b81bde
Export reports to own directory
AlexAxthelm May 30, 2024
6f334b9
Update calling function
AlexAxthelm May 30, 2024
219822a
Upload Reports
AlexAxthelm May 30, 2024
8528d3b
Add comment with links
AlexAxthelm May 30, 2024
3ee176c
Remove special characters from artifact name
AlexAxthelm May 30, 2024
1c05177
Update comment json path
AlexAxthelm May 30, 2024
bc263c9
fix filenames
AlexAxthelm May 30, 2024
f8deff4
fix file name
AlexAxthelm May 30, 2024
eb60387
Add the double `/report`
AlexAxthelm May 30, 2024
337a7d3
Specify analysuis outputs as config
AlexAxthelm May 31, 2024
2de9cd3
Add benchmarks data to config
AlexAxthelm May 31, 2024
a203a85
Change configs
AlexAxthelm May 31, 2024
4367209
Isolate Report Output dir
AlexAxthelm May 31, 2024
f1ea731
Isolate summary outputs
AlexAxthelm May 31, 2024
ebeb461
Update testing script
AlexAxthelm May 31, 2024
330471c
Update test prep
AlexAxthelm May 31, 2024
fbe17a7
Create and change permissions for correct dir
AlexAxthelm May 31, 2024
1096136
Upload correct files
AlexAxthelm May 31, 2024
7412241
Provide correct link to ES
AlexAxthelm May 31, 2024
1410b5b
remove readonly flags on output binds
AlexAxthelm May 31, 2024
ba0bc93
update summary url reference
AlexAxthelm May 31, 2024
1b0726a
Add dependency on `pacta.workflow.utils`
AlexAxthelm May 31, 2024
07c2a6b
read params using `pacta.workflow.utils`
AlexAxthelm May 31, 2024
a26160f
use params object for language select
AlexAxthelm May 31, 2024
be4eb41
rename `cfg[[]]` to `params[[]]`
AlexAxthelm May 31, 2024
eb2e1b1
remove last references to cfg in top-level script
AlexAxthelm May 31, 2024
7cd1300
factor `cfg` out of ES process
AlexAxthelm May 31, 2024
37696ef
Fix bad quotes
AlexAxthelm May 31, 2024
daaa613
Factor `cfg` out of interactive report process
AlexAxthelm May 31, 2024
44afcf5
update lintr sttings
AlexAxthelm May 31, 2024
9c0a60f
Remove unused dependency
AlexAxthelm May 31, 2024
e093020
Add sysdeps
AlexAxthelm May 31, 2024
3071094
Allow test script to read PARAMs
AlexAxthelm May 31, 2024
213a10a
Move file
AlexAxthelm May 31, 2024
d32cfeb
simplify default params
AlexAxthelm May 31, 2024
af887c5
Move params to config
AlexAxthelm May 31, 2024
098109d
Remove unneded class assignment
AlexAxthelm May 31, 2024
8d7fba4
Fix call to real estate dir
AlexAxthelm May 31, 2024
d632575
Add more bind mounts
AlexAxthelm May 31, 2024
16fb696
Fix bad path in test suite
AlexAxthelm May 31, 2024
d3ecd91
Explicitly no validation yet
AlexAxthelm May 31, 2024
c1c5e73
Add inheritance parameters
AlexAxthelm May 31, 2024
928afe2
Disable test
AlexAxthelm May 31, 2024
9bcdc6a
Fix output paths in test
AlexAxthelm Jun 3, 2024
ed70eac
Use main branch for dependency
AlexAxthelm Jun 3, 2024
0b711fa
Move `start_year` param to year-specific files
AlexAxthelm Jun 3, 2024
6f73ddb
Quic update for readme
AlexAxthelm Jun 3, 2024
ef3c845
Apply suggestions from code review
AlexAxthelm Jun 4, 2024
2ee3547
reindent block
AlexAxthelm Jun 4, 2024
15f0ba4
Fix docker label
AlexAxthelm Jun 4, 2024
e778ffc
Update error string
AlexAxthelm Jun 4, 2024
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
11 changes: 11 additions & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
^.dockerignore$
^.github/
^.lintr$
^Dockerfile$
^LICENSE\.md$
^docker-compose.yml$
^input_dir/
^output_dir/
^portfolios/
^run-pacta.sh$
^workflow.pacta.Rproj$
11 changes: 11 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
**/.git
**/.github
**/.gitignore
**/Dockerfile
**/*.md
**/*.Rproj
output_dir/**/*
output_dir
pacta-data/**/*
pacta-data
docker-compose.yml
22 changes: 22 additions & 0 deletions .github/workflows/R.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
# This example file will enable R language checks on push or PR to the main
# branch.
# It will also run the checks every weeknight at midnight UTC
#
# Note the @main in `uses:` on the last line. This will call the latest version
# of the workflow from the `main` brnach in the RMI-PACTA/actions repo. You can
# also specify a tag from that repo, or a commit SHA to pin action versions.
on:
pull_request:
push:
branches: [main]
schedule:
- cron: '0 0 * * 1,2,3,4,5'
workflow_dispatch:

name: R

jobs:
R-package:
name: R Package Checks
uses: RMI-PACTA/actions/.github/workflows/R.yml@main
12 changes: 0 additions & 12 deletions .github/workflows/build-Docker-image-nightly.yml

This file was deleted.

12 changes: 0 additions & 12 deletions .github/workflows/build-Docker-image-on-push-to-main.yml

This file was deleted.

37 changes: 0 additions & 37 deletions .github/workflows/build-Docker-image-on-push-to-pr.yml

This file was deleted.

67 changes: 0 additions & 67 deletions .github/workflows/build-and-push-Docker-image.yml

This file was deleted.

32 changes: 0 additions & 32 deletions .github/workflows/check-R-sysdeps.yml

This file was deleted.

39 changes: 39 additions & 0 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
---
on:
pull_request:
push:
branches: [main]
schedule:
- cron: '0 0 * * 1,2,3,4,5'
workflow_dispatch:

name: docker

jobs:
docker:
name: Docker actions
uses: RMI-PACTA/actions/.github/workflows/docker.yml@main

test:
name: Test
uses: ./.github/workflows/test.yml
needs: [docker]
secrets: inherit
strategy:
fail-fast: false
matrix:
config-name:
- default_2022Q4
- default_2023Q4
# - full_params_2023Q4
with:
full-image-name: ${{ needs.docker.outputs.full-image-name }}
config-name: ${{ matrix.config-name }}

add-comment:
if: ${{ github.event_name == 'pull_request' }}
uses: RMI-PACTA/actions/.github/workflows/add-comment-table.yml@main
needs: [test]
with:
header: "Report Links"
artifact-prefix: report-comment-json
11 changes: 0 additions & 11 deletions .github/workflows/run-hadolint.yml

This file was deleted.

Loading
Loading