Skip to content

Commit

Permalink
Merge branch 'release/v1.0.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
howardjp committed Jul 14, 2021
2 parents 14d817c + 8b95847 commit 9d57ede
Show file tree
Hide file tree
Showing 6 changed files with 73 additions and 34 deletions.
63 changes: 63 additions & 0 deletions .github/workflows/check-develop.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
# For help debugging build failures open an issue on the RStudio community with the 'github-actions' tag.
# https://community.rstudio.com/new-topic?category=Package%20development&tags=github-actions
on:
schedule:
- cron: '15 1 * * *'
push:
branches:
- develop
pull_request:
branches:
- develop

name: Build (develop)

jobs:
Build:
runs-on: ${{ matrix.config.os }}

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

strategy:
fail-fast: false
matrix:
config:
- {os: windows-latest, r: 'release'}
- {os: macOS-latest, r: 'release'}

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

steps:
- uses: actions/checkout@v2

- uses: r-lib/actions/setup-r@v1
with:
r-version: ${{ matrix.config.r }}

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

- name: Install dependencies
run: |
install.packages(c("remotes", "rcmdcheck", "usethis"))
remotes::install_deps(dependencies = TRUE)
shell: Rscript {0}

- name: Check
env:
_R_CHECK_FORCE_SUGGESTS_: false
_R_CHECK_CRAN_INCOMING_REMOTE_: false
run: |
devtools::document()
options(crayon.enabled = TRUE)
rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran"), error_on = "warning", check_dir = "check")
shell: Rscript {0}

- name: Upload check results
if: failure()
uses: actions/upload-artifact@main
with:
name: ${{ runner.os }}-r${{ matrix.config.r }}-results
path: check


Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,11 @@ on:
push:
branches:
- main
- master
- develop
pull_request:
branches:
- main
- master
- develop

name: Build
name: Build (main)

jobs:
Build:
Expand Down
21 changes: 0 additions & 21 deletions .travis.yml

This file was deleted.

8 changes: 4 additions & 4 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
Package: cmna
Type: Package
Title: Computational Methods for Numerical Analysis
Version: 1.0.4
Date: 2021-07-11
Version: 1.0.5
Date: 2021-07-14
Encoding: UTF-8
Authors@R: person(given = "James", family = "Howard",
email = "[email protected]", role = c("aut", "cre"),
comment = c(ORCID = "0000-0003-4530-1547"))
URL: https://jameshoward.us/cmna
URL: https://jameshoward.us/cmna/
BugReports: https://github.com/k3jph/cmna-pkg/issues
Description: Provides the source and examples for James P. Howard, II,
"Computational Methods for Numerical Analysis with R,"
<https://jameshoward.us/cmna>, a book on numerical
<https://jameshoward.us/cmna/>, a book on numerical
methods in R.
License: BSD_2_clause + file LICENSE
Suggests:
Expand Down
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@

![CRAN/METACRAN](https://img.shields.io/cran/v/cmna)
[![Downloads from the RStudio CRAN mirror](https://cranlogs.r-pkg.org/badges/cmna)](https://cran.r-project.org/package=cmna)
[![Build Status](https://github.com/k3jph/cmna-pkg/actions/workflows/check-release.yaml/badge.svg?branch=main)](https://github.com/k3jph/cmna-pkg/actions/workflows/check-release.yaml)
[![Build Status (main)](https://github.com/k3jph/cmna-pkg/actions/workflows/check-main.yaml/badge.svg?branch=main)](https://github.com/k3jph/cmna-pkg/actions/workflows/check-main.yaml)
[![Build Status (develop)](https://github.com/k3jph/cmna-pkg/actions/workflows/check-develop.yaml/badge.svg?branch=develop)](https://github.com/k3jph/cmna-pkg/actions/workflows/check-develop.yaml)
[![codecov](https://codecov.io/gh/k3jph/cmna-pkg/branch/master/graph/badge.svg)](https://codecov.io/gh/k3jph/cmna-pkg)
[![Codacy Badge](https://app.codacy.com/project/badge/Grade/75dad26c84804291ab359fc32e67f635)](https://www.codacy.com/gh/k3jph/cmna-pkg/dashboard?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=k3jph/cmna-pkg&amp;utm_campaign=Badge_Grade)
[![Codacy Badge](https://app.codacy.com/project/badge/Grade/75dad26c84804291ab359fc32e67f635)](https://app.codacy.com/gh/k3jph/cmna-pkg/dashboard)
[![Package DOI](https://img.shields.io/badge/Package_DOI-10.5281%2Fzenodo.3249230-blue.svg)](https://doi.org/10.5281/zenodo.3249230)
[![Book DOI](https://img.shields.io/badge/Book_DOI-10.1201%2F9781315120195-blue.svg)](https://doi.org/10.1201/9781315120195)

Expand Down Expand Up @@ -140,7 +141,7 @@ with a computational and numerical background.

## Contribution guidelines

* Use [Git Flow](http://nvie.com/posts/a-successful-git-branching-model/)
* Use [Git Flow](https://nvie.com/posts/a-successful-git-branching-model/)
* Write unit tests using [testthat](https://github.com/hadley/testthat)
* Document functions using [roxygen2](https://github.com/yihui/roxygen2)

Expand Down
2 changes: 1 addition & 1 deletion inst/CITATION
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ bibentry(bibtype = "Book",
publisher = "Chapman and Hall/CRC",
address = "New York",
series = "Numerical Analysis and Scientific Computing Series",
url = "https://jameshoward.us/cmna")
url = "https://jameshoward.us/cmna/")

0 comments on commit 9d57ede

Please sign in to comment.