Skip to content

Commit

Permalink
Merge pull request #128 from USEPA/state_level_initial
Browse files Browse the repository at this point in the history
State level initial
  • Loading branch information
knoiva-indecon authored Dec 19, 2023
2 parents 12e8b32 + 9495a8e commit 3a15d20
Show file tree
Hide file tree
Showing 26 changed files with 2,922 additions and 2,187 deletions.
10 changes: 8 additions & 2 deletions .github/workflows/test_fredi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
Rscript -e '
devtools::install_github(
repo = "https://github.com/USEPA/FrEDI",
ref = "main",
ref = "${{ github.ref_name }}",
subdir = "FrEDI",
dependencies = FALSE,
upgrade = "never",
Expand Down Expand Up @@ -94,6 +94,11 @@ jobs:
### Test results
if(do_tests){
### Check if path exists and, if not, create it
exists0 <- oPath1 |> dir.exists()
if(!exists0){oPath1 |> dir.create(recursive = TRUE)}
### Run FrEDI
results0 <- run_fredi()
### Run tests
Expand All @@ -119,7 +124,8 @@ jobs:
### Check if path exists and, if not, create it
exists0 <- oPath2 |> dir.exists()
if(!exists0){oPath2 |> dir.create()}
if(!exists0){oPath2 |> dir.create(recursive = TRUE)}
### Create report figures
reports0 <- create_DoW_results(
Expand Down
28 changes: 28 additions & 0 deletions .github/workflows/update_base_data.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Update Base System Data

on:
workflow_dispatch:
inputs:
fredi_data_branches:
type: string
description: Which data only branch of FrEDI_data to pull in data from? (i.e. data_only_branch_state_initial)


jobs:
get_data:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Commit results
run: |
git config --global user.email "[email protected]"
git config --global user.name "GitHub Actions"
git pull --depth=1 --ff https://github.com/USEPA/FrEDI_Data.git ${{ github.event.inputs.fredi_data_branches }} --allow-unrelated-histories
mv data/tmp_sysdata.rda FrEDI/R/sysdata.rda
git branch --show-current
git add FrEDI/R/sysdata.rda
git rm -r data
git pull origin ${{ github.head_ref }} --autostash --rebase -X ours
git status
git commit -am "add new sysdata.rda from ${{ github.event.inputs.fredi_data_branches }}"
git push
16 changes: 0 additions & 16 deletions FrEDI/.github/workflows/greetings.yml

This file was deleted.

2 changes: 1 addition & 1 deletion FrEDI/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@ Depends: R (>= 3.5.0),
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.2.3
LazyData: TRUE
Suggests: knitr, rmarkdown, prettydoc, devtools
Suggests: knitr, rmarkdown, prettydoc, devtools, kableExtra
VignetteBuilder: knitr
Language: en-US
Loading

0 comments on commit 3a15d20

Please sign in to comment.