diff --git a/.github/workflows/compile_main_fredi_data.yml b/.github/workflows/compile_main_fredi_data.yml index 5ce5af9..ba1ecad 100644 --- a/.github/workflows/compile_main_fredi_data.yml +++ b/.github/workflows/compile_main_fredi_data.yml @@ -43,47 +43,47 @@ jobs: any::zoo - # - name: Install FrEDI - # run: | - # Rscript -e ' - # devtools::install_github( - # repo = "https://github.com/USEPA/FrEDI", - # ref = "${{ github.event.inputs.branch_name }}", - # # subdir = "FrEDI", - # dependencies = FALSE, - # upgrade = "never", - # force = TRUE, - # type = "source" - # )' - # - # - name: Run createsystemData - # run: | - # Rscript -e ' - # projectDir <- "." - # scriptDir <- projectDir |> file.path("scripts") - # scriptDir |> file.path("configureFrediData.R") |> source() - # test0 <- projectDir |> configureFrediData(save=T) - # "./data_tests/" |> list.files() |> print() - # "./data/" |> list.files() |> print() - # ' - # - # - name: Upload Tests - # uses: actions/upload-artifact@v4 - # with: - # name: Data - # path: | - # ./data_tests/* - # ./data/tmp_sysdata.rd* - # - # - # - name: Commit results - # run: | - # git config --local core.autocrlf false - # git config --local user.email "${{ github.actor }}@users.noreply.github.com" - # git config --local user.name "${{ github.actor }}" - # git add data/tmp_sysdata.rd* - # git add data_tests/**.xlsx - # git pull origin ${{ github.head_ref }} --autostash --rebase -X ours - # git commit -a -m "Updated temporary system data and tests" - # git push + - name: Install FrEDI + run: | + Rscript -e ' + devtools::install_github( + repo = "https://github.com/USEPA/FrEDI", + ref = "${{ github.event.inputs.branch_name }}", + # subdir = "FrEDI", + dependencies = FALSE, + upgrade = "never", + force = TRUE, + type = "source" + )' + + - name: Run createsystemData + run: | + Rscript -e ' + projectDir <- "." + scriptDir <- projectDir |> file.path("scripts") + scriptDir |> file.path("configureFrediData.R") |> source() + test0 <- projectDir |> configureFrediData(save=T) + "./data_tests/" |> list.files() |> print() + "./data/" |> list.files() |> print() + ' + + - name: Upload Tests + uses: actions/upload-artifact@v4 + with: + name: Data + path: | + ./data_tests/* + ./data/tmp_sysdata.rd* + + + - name: Commit results + run: | + git config --local core.autocrlf false + git config --local user.email "${{ github.actor }}@users.noreply.github.com" + git config --local user.name "${{ github.actor }}" + git add data/tmp_sysdata.rd* + git add data_tests/**.xlsx + git pull origin ${{ github.head_ref }} --autostash --rebase -X ours + git commit -a -m "Updated temporary system data and tests" + git push