Skip to content

Commit

Permalink
Merge pull request #142 from USEPA/update-actions
Browse files Browse the repository at this point in the history
Update actions
  • Loading branch information
cristinamullin authored Mar 13, 2024
2 parents 225a960 + 4d8bfc4 commit 533d540
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 14,687 deletions.
18 changes: 1 addition & 17 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,6 @@ A clear and concise description of what you expected to happen.

If applicable, add screenshots to help explain your problem.

**Session Info**

Please include your session info:

``` r
sessionInfo()
#OR preferred:
devtools::session_info()
```

**Additional context**

Add any other context about the problem here.
Expand All @@ -65,10 +55,4 @@ New features should include all of the following work:

- [ ] Document all code using comments to describe what is does.

- [ ] Create tests in tests folder.

- [ ] Create help file using roxygen2 above code.

- [ ] Create working examples in help file (via roxygen2).

- [ ] Add to appropriate vignette (or create new one).
- [ ] Create tests.
8 changes: 1 addition & 7 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,4 @@ New features should include all of the following work:

- [ ] Document all code using comments to describe what is does.

- [ ] Create tests in tests folder.

- [ ] Create help file using roxygen2 above code.

- [ ] Create working examples in help file (via roxygen2).

- [ ] Add to appropriate vignette (or create new one).
- [ ] Create tests.
12 changes: 1 addition & 11 deletions .github/ISSUE_TEMPLATE/question.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ A clear and concise description of the question.
Include the Water Quality Portal data query inputs entered on the Load
data tab:

If possible, narrow down the question to a specific dataset and
If possible, narrow down the question to a specific data set and
`TADAShiny`tab or function:

``` r
Expand All @@ -38,16 +38,6 @@ A clear and concise description of what you expected to happen.

If applicable, add screenshots to help explain your problem.

**Session Info**

Please include your session info:

``` r
sessionInfo()
#OR preferred:
devtools::session_info()
```

**Additional context**

Add any other context about the problem here.
8 changes: 7 additions & 1 deletion .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ on:

name: R-CMD-check

# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
# Also, cancel in-progress runs.
# concurrency:
# group: "R-CMD-check"
# cancel-in-progress: true

jobs:
R-CMD-check:
runs-on: ${{ matrix.config.os }}
Expand All @@ -31,7 +37,7 @@ jobs:
R_KEEP_PKG_SOURCE: yes

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: r-lib/actions/setup-pandoc@v2

Expand Down
51 changes: 0 additions & 51 deletions .github/workflows/pr-commands.yaml

This file was deleted.

12 changes: 6 additions & 6 deletions .github/workflows/test-coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [develop, staging, main]
branches: [develop]
pull_request:
branches: [develop, staging, main]
branches: [develop]

name: test-coverage

Expand All @@ -15,7 +15,7 @@ jobs:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: r-lib/actions/setup-r@v2
with:
Expand All @@ -31,20 +31,20 @@ jobs:
covr::codecov(
quiet = FALSE,
clean = FALSE,
install_path = file.path(Sys.getenv("RUNNER_TEMP"), "package")
install_path = file.path(normalizePath(Sys.getenv("RUNNER_TEMP"), winslash = "/"), "package")
)
shell: Rscript {0}

- name: Show testthat output
if: always()
run: |
## --------------------------------------------------------------------
find ${{ runner.temp }}/package -name 'testthat.Rout*' -exec cat '{}' \; || true
find '${{ runner.temp }}/package' -name 'testthat.Rout*' -exec cat '{}' \; || true
shell: bash

- name: Upload test results
if: failure()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: coverage-test-failures
path: ${{ runner.temp }}/package
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,6 @@ _snaps
.Ruserdata
.vscode/
.Rbuildignore

# Trip's testing file
flagged.csv
2 changes: 1 addition & 1 deletion R/utils.R
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ utils::globalVariables(c(
"nd_method", "nd_mult", "od_method", "org_table",
"organization", "original_source", "project", "sampleMedia",
"selected_filters", "selected_flags", "siteType",
"siteid", "startDate", "statecode"
"siteid", "startDate", "statecode", "od_mult", "field_sel"
))
Loading

0 comments on commit 533d540

Please sign in to comment.