Skip to content

Commit

Permalink
updated R-CMD-check.yaml to run correct checks on push
Browse files Browse the repository at this point in the history
  • Loading branch information
jtfeld committed May 9, 2023
1 parent 5ed043f commit 010fd7a
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 17 deletions.
19 changes: 11 additions & 8 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Workflow derived from https://github.com/r-lib/actions/tree/master/examples
# 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:
Expand All @@ -18,7 +18,7 @@ jobs:
fail-fast: false
matrix:
config:
- {os: macOS-latest, r: 'release'}
- {os: macos-latest, r: 'release'}
- {os: windows-latest, r: 'release'}
- {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
- {os: ubuntu-latest, r: 'release'}
Expand All @@ -29,18 +29,21 @@ jobs:
R_KEEP_PKG_SOURCE: yes

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

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

- uses: r-lib/actions/setup-r@v1
- 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@v1
- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: rcmdcheck
extra-packages: any::rcmdcheck
needs: check

- uses: r-lib/actions/check-r-package@v1
- uses: r-lib/actions/check-r-package@v2
with:
upload-snapshots: true
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Package: EloOptimized
Title: Optimized Elo Rating Method for Obtaining Dominance Ranks
Version: 0.3.1.9000
Date: 2021-12-18
Date: 2023-05-08
Authors@R: c(
person("Joseph", "Feldblum", email = "feldblum@umich.edu", role = c("aut", "cre")),
person("Joseph", "Feldblum", email = "jtf9@duke.edu", role = c("aut", "cre")),
person("Steffen", "Foerster", email = "sf2041@gmail.com", role = c("aut")),
person("Mathias", "Franz", email = "m.franz@izw-berlin.de", role = c("aut")))
Description: Provides an implementation of the maximum likelihood methods for deriving
Expand All @@ -13,7 +13,7 @@ Depends:
License: GPL-3
Encoding: UTF-8
LazyData: true
RoxygenNote: 7.1.1
RoxygenNote: 7.2.3
Imports: dplyr,
reshape2,
BAMMtools,
Expand Down
2 changes: 1 addition & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

* Added a step to check that agon_data are in chronological order, and throw a warning if not.

* removed ubuntu checks (tried "- {os: ubuntu-latest, r: 'release'}" and "- {os: ubuntu-18.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"}", and various other combinations, none of them worked, I'll have to figure out how to make this work again I guess before submitting next version to CRAN)
* Fixed checks for ubuntu and Mac

* Added new and improved informative errors to eloratingopt() that tell you which individuals are filtered out for not having >= 1 win and 1 loss, and which individuals have interactions outside of their presence window.

Expand Down
3 changes: 1 addition & 2 deletions README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ library(EloOptimized)

<!-- badges: start -->

[![Travis-CI Build Status](https://travis-ci.org/jtfeld/EloOptimized.svg?branch=master)](https://travis-ci.org/jtfeld/EloOptimized)
[![R-CMD-check](https://github.com/jtfeld/EloOptimized/workflows/R-CMD-check/badge.svg)](https://github.com/jtfeld/EloOptimized/actions)
[![R-CMD-check](https://github.com/jtfeld/EloOptimized/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/jtfeld/EloOptimized/actions/workflows/R-CMD-check.yaml)
[![CRAN_Status_Badge](http://www.r-pkg.org/badges/version/EloOptimized)](https://cran.r-project.org/package=EloOptimized)
[![](https://cranlogs.r-pkg.org/badges/grand-total/EloOptimized)](https://cran.r-project.org/package=EloOptimized)
<!-- badges: end -->
Expand Down
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@

<!-- badges: start -->

[![Travis-CI Build
Status](https://travis-ci.org/jtfeld/EloOptimized.svg?branch=master)](https://travis-ci.org/jtfeld/EloOptimized)
[![R-CMD-check](https://github.com/jtfeld/EloOptimized/workflows/R-CMD-check/badge.svg)](https://github.com/jtfeld/EloOptimized/actions)
[![R-CMD-check](https://github.com/jtfeld/EloOptimized/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/jtfeld/EloOptimized/actions/workflows/R-CMD-check.yaml)
[![CRAN_Status_Badge](http://www.r-pkg.org/badges/version/EloOptimized)](https://cran.r-project.org/package=EloOptimized)
[![](https://cranlogs.r-pkg.org/badges/grand-total/EloOptimized)](https://cran.r-project.org/package=EloOptimized)
<!-- badges: end -->
Expand Down

0 comments on commit 010fd7a

Please sign in to comment.