Skip to content

Commit

Permalink
Updated GHA (#68)
Browse files Browse the repository at this point in the history
* Changed GHA R-CMD-check from release to standard

* Updated GHA pkgdown

* Required R version >= 4.4.0

* Updated title case, separate URLs with comma

* Updated medrxiv urls

* Increment version number to 0.1.3

* Removed old empty news entries

* Regenerated docs after fixing urls

* Removed 'oldrel-1' ubuntu rcmdcheck until R 4.5.0

* Added .DS_Store to .Rbuildignore
  • Loading branch information
SkylarMarvel authored Oct 29, 2024
1 parent c2086cc commit 598f9f2
Show file tree
Hide file tree
Showing 10 changed files with 74 additions and 58 deletions.
1 change: 1 addition & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
^renv$
^renv\.lock$
^\.Rprofile$
^\.DS_Store$
^GeoTox\.Rproj$
^\.Rproj\.user$
^LICENSE\.md$
Expand Down
52 changes: 52 additions & 0 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [main, master]
pull_request:
branches: [main, master]

name: R-CMD-check.yaml

permissions: read-all

jobs:
R-CMD-check:
runs-on: ${{ matrix.config.os }}

name: ${{ matrix.config.os }} (${{ matrix.config.r }})

strategy:
fail-fast: false
matrix:
config:
- {os: macos-latest, r: 'release'}
- {os: windows-latest, r: 'release'}
- {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
- {os: ubuntu-latest, r: 'release'}
#- {os: ubuntu-latest, r: 'oldrel-1'}

env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
R_KEEP_PKG_SOURCE: yes

steps:
- uses: actions/checkout@v4

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

- uses: r-lib/actions/setup-r@v2
with:
r-version: ${{ matrix.config.r }}
http-user-agent: ${{ matrix.config.http-user-agent }}
use-public-rspm: true

- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: any::rcmdcheck
needs: check

- uses: r-lib/actions/check-r-package@v2
with:
upload-snapshots: true
build_args: 'c("--no-manual","--compact-vignettes=gs+qpdf")'
31 changes: 0 additions & 31 deletions .github/workflows/check-release.yaml

This file was deleted.

8 changes: 5 additions & 3 deletions .github/workflows/pkgdown.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ on:
types: [published]
workflow_dispatch:

name: pkgdown
name: pkgdown.yaml

permissions: read-all

jobs:
pkgdown:
Expand All @@ -22,7 +24,7 @@ jobs:
permissions:
contents: write
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

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

Expand All @@ -41,7 +43,7 @@ jobs:

- name: Deploy to GitHub pages 🚀
if: github.event_name != 'pull_request'
uses: JamesIves/github-pages-deploy-action@v4.4.1
uses: JamesIves/github-pages-deploy-action@v4.5.0
with:
clean: false
branch: gh-pages
Expand Down
8 changes: 4 additions & 4 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
Package: GeoTox
Title: Spatiotemporal mixture risk assessment
Version: 0.1.2
Title: Spatiotemporal Mixture Risk Assessment
Version: 0.1.3
Authors@R: c(
person("Skylar", "Marvel", , "[email protected]", role = c("aut", "ctb"), comment = c(ORCID = "0000-0002-2971-9743")),
person("David", "Reif", , "[email protected]", role = c("aut", "ctb"), comment = c(ORCID = "0000-0001-7815-6767")),
person("Kyle", "Messier", , "[email protected]", role = c("cre", "aut", "ctb"), comment = c(ORCID = "0000-0001-9508-9623"))
)
Description: Connecting spatiotemporal exposure to individual and population-level risk via source-to-outcome continuum modeling.
License: MIT + file LICENSE
URL: https://niehs.github.io/GeoTox/ https://github.com/NIEHS/GeoTox
URL: https://niehs.github.io/GeoTox/, https://github.com/NIEHS/GeoTox
Depends:
R (>= 4.1.0)
R (>= 4.4.0)
Imports:
dplyr,
ggplot2,
Expand Down
8 changes: 2 additions & 6 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
# GeoTox 0.1.2
# GeoTox 0.1.3

# GeoTox 0.1.1

# GeoTox 0.1.0

# 0.0.1
# GeoTox 0.0.1
- Adding supporting documents to the `GeoTox` repository such as this news.md, issue templates, and contributor's guide
- NC areal level analysis vignette is complete
- Key developments on the object oriented approach: simulate and sensitivity wrappers
Expand Down
7 changes: 2 additions & 5 deletions README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,10 @@ knitr::opts_chunk$set(
<!-- badges: start -->

[![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active)
[![R-CMD-check](https://github.com/NIEHS/GeoTox/actions/workflows/check-release.yaml/badge.svg)](https://github.com/NIEHS/GeoTox/actions/workflows/check-release.yaml)
[![R-CMD-check](https://github.com/NIEHS/GeoTox/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/NIEHS/GeoTox/actions/workflows/R-CMD-check.yaml)
[![pkgdown](https://github.com/NIEHS/GeoTox/actions/workflows/pkgdown.yaml/badge.svg)](https://github.com/NIEHS/GeoTox/actions/workflows/pkgdown.yaml)
[![cov](https://NIEHS.github.io/GeoTox/badges/coverage.svg)](https://github.com/NIEHS/GeoTox/actions)
[![CRAN status](https://www.r-pkg.org/badges/version/GeoTox)](https://CRAN.R-project.org/package=GeoTox)

<!-- badges: end -->


Expand All @@ -37,9 +36,7 @@ The package will be on CRAN in the near future - please stay tuned. You can inst
[GitHub](https://github.com/NIEHS/GeoTox) with:

```{r, eval=FALSE}
if (!require("pak", quietly = TRUE)) {
install.packages("pak")
}
install.packages("pak")
pak::pkg_install("NIEHS/GeoTox")
```

Expand Down
8 changes: 3 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,11 @@
[![Project Status: Active – The project has reached a stable, usable
state and is being actively
developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active)
[![R-CMD-check](https://github.com/NIEHS/GeoTox/actions/workflows/check-release.yaml/badge.svg)](https://github.com/NIEHS/GeoTox/actions/workflows/check-release.yaml)
[![R-CMD-check](https://github.com/NIEHS/GeoTox/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/NIEHS/GeoTox/actions/workflows/R-CMD-check.yaml)
[![pkgdown](https://github.com/NIEHS/GeoTox/actions/workflows/pkgdown.yaml/badge.svg)](https://github.com/NIEHS/GeoTox/actions/workflows/pkgdown.yaml)
[![cov](https://NIEHS.github.io/GeoTox/badges/coverage.svg)](https://github.com/NIEHS/GeoTox/actions)
[![CRAN
status](https://www.r-pkg.org/badges/version/GeoTox)](https://CRAN.R-project.org/package=GeoTox)

<!-- badges: end -->

`GeoTox` open-source R software package for characterizing the risk of
Expand All @@ -36,9 +35,7 @@ can install the development version of GeoTox from
[GitHub](https://github.com/NIEHS/GeoTox) with:

``` r
if (!require("pak", quietly = TRUE)) {
install.packages("pak")
}
install.packages("pak")
pak::pkg_install("NIEHS/GeoTox")
```

Expand All @@ -55,6 +52,7 @@ the information required to run the analysis including tracking
exposure, assays, dose-response, and geospatial referencing.

<p align="center">

<img src="man/figures/GeoTox-Workflow.png" alt="GeoTox-Workflow"> <br>
<em>Figure 1: Overview of the steps in the GeoTox framework</em>
</p>
Expand Down
4 changes: 2 additions & 2 deletions inst/CITATION
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ bibentry(
year = "2024",
doi = "10.1101/2024.09.23.24314096",
elocationid = "2024.09.23.24314096",
url = "https://www.medrxiv.org/content/early/2024/09/24/2024.09.23.24314096",
eprint = "https://www.medrxiv.org/content/early/2024/09/24/2024.09.23.24314096.full.pdf"
url = "https://www.medrxiv.org/content/10.1101/2024.09.23.24314096v1",
eprint = "https://www.medrxiv.org/content/10.1101/2024.09.23.24314096v1.full.pdf"
)

bibentry(
Expand Down
5 changes: 3 additions & 2 deletions man/GeoTox-package.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 598f9f2

Please sign in to comment.