From 1c6c31aeea8ecff93c9bcf4c63d0441164f40a1b Mon Sep 17 00:00:00 2001 From: Timothy Bates Date: Sun, 3 Nov 2024 16:48:48 +0000 Subject: [PATCH 1/4] Update fit_and_reporting.R --- R/fit_and_reporting.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/fit_and_reporting.R b/R/fit_and_reporting.R index 2ea25f40..1bd9d05f 100644 --- a/R/fit_and_reporting.R +++ b/R/fit_and_reporting.R @@ -3755,7 +3755,7 @@ parameters <- umxParameters #' @param fetch What to return: "labels" (default) or "values", "free", "lbound", "ubound", or "all" #' @param verbose How much feedback to give #' @export -#' @seealso [omxGetParameters()], [parameters()] +#' @seealso [OpenMx::omxGetParameters()], [parameters()] #' @family Reporting Functions #' @references - #' @md From 3b8f93371f10a13b5137b159171edde06903aa91 Mon Sep 17 00:00:00 2001 From: Tim Bates Date: Sun, 17 Nov 2024 17:48:42 +0000 Subject: [PATCH 2/4] Update r.yml just latest R --- .github/workflows/r.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/r.yml b/.github/workflows/r.yml index 4fb41712..ef705f6b 100644 --- a/.github/workflows/r.yml +++ b/.github/workflows/r.yml @@ -22,7 +22,7 @@ jobs: runs-on: macos-latest strategy: matrix: - r-version: ['3.6.3', '4.1.1'] + r-version: ['4.4.1'] steps: - uses: actions/checkout@v4 From 3dd9dde2e852bf33c94180ae679b797035f561ef Mon Sep 17 00:00:00 2001 From: Tim Bates Date: Sun, 17 Nov 2024 18:10:21 +0000 Subject: [PATCH 3/4] Update r.yml --- .github/workflows/r.yml | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/.github/workflows/r.yml b/.github/workflows/r.yml index ef705f6b..bdf3449b 100644 --- a/.github/workflows/r.yml +++ b/.github/workflows/r.yml @@ -22,19 +22,31 @@ jobs: runs-on: macos-latest strategy: matrix: - r-version: ['4.4.1'] + r-version: ['4.2', '4.3', '4.4.1'] steps: + - uses: actions/cache@v3 - uses: actions/checkout@v4 + with: + path: ~/.R/library + key: ${{ runner.os }}-r-${{ matrix.r-version }}-${{ hashFiles('**/DESCRIPTION') }} + restore-keys: | + ${{ runner.os }}-r-${{ matrix.r-version }}- + ${{ runner.os }}-r- - name: Set up R ${{ matrix.r-version }} - uses: r-lib/actions/setup-r@f57f1301a053485946083d7a45022b278929a78a + uses: r-lib/actions/setup-r@v2 with: r-version: ${{ matrix.r-version }} - name: Install dependencies run: | - install.packages(c("remotes", "rcmdcheck")) + install.packages(c("remotes", "rcmdcheck", "covr")) remotes::install_deps(dependencies = TRUE) shell: Rscript {0} - - name: Check - run: rcmdcheck::rcmdcheck(args = "--no-manual", error_on = "error") + - name: Check package + run: | + rcmdcheck::rcmdcheck(args = "--no-manual", error_on = "error") + devtools::check() + shell: Rscript {0} + - name: Code Coverage + run: covr::codecov() shell: Rscript {0} From 381bdd5c5667a436eab7f9346b4a8462163f79af Mon Sep 17 00:00:00 2001 From: Tim Bates Date: Sun, 17 Nov 2024 18:13:21 +0000 Subject: [PATCH 4/4] Update r.yml --- .github/workflows/r.yml | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/.github/workflows/r.yml b/.github/workflows/r.yml index bdf3449b..e3b25b88 100644 --- a/.github/workflows/r.yml +++ b/.github/workflows/r.yml @@ -1,12 +1,4 @@ -# This workflow uses actions that are not certified by GitHub. -# They are provided by a third-party and are governed by -# separate terms of service, privacy policy, and support -# documentation. -# -# See https://github.com/r-lib/actions/tree/master/examples#readme for -# additional example workflows available for the R community. - -name: R +name: Build umx for R on: push: @@ -22,8 +14,7 @@ jobs: runs-on: macos-latest strategy: matrix: - r-version: ['4.2', '4.3', '4.4.1'] - + r-version: ['4.2', '4.4.1'] steps: - uses: actions/cache@v3 - uses: actions/checkout@v4