Skip to content

Commit

Permalink
Merge branch 'main' into devel
Browse files Browse the repository at this point in the history
  • Loading branch information
adamhsparks committed Dec 8, 2020
2 parents db371b2 + e971602 commit 98bf5b8
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/update-tic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:

- name: "[Stage] Dependencies"
run: |
sudo apt install libcurl4-openssl-dev libsodium-dev
sudo apt install libcurl4-openssl-dev libsodium-dev libharfbuzz-dev libfribidi-dev
Rscript -e "if (!requireNamespace('remotes')) install.packages('remotes', type = 'source')"
Rscript -e "remotes::install_github('ropensci/tic', dependencies = TRUE)"
Expand All @@ -50,4 +50,4 @@ jobs:
commit-message: "update tic templates"
body: "{tic} templates can be updated :rocket: :robot:"
branch: update-tic
base: master
base: main
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
# hagis
<!-- 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)
[![tic](https://github.com/openplantpathology/hagis/workflows/tic/badge.svg?branch=master)](https://github.com/openplantpathology/hagis/actions)
[![tic](https://github.com/openplantpathology/hagis/workflows/tic/badge.svg?branch=main)](https://github.com/openplantpathology/hagis/actions)
[![CRAN\_Status\_Badge](https://www.r-pkg.org/badges/version/hagis)](https://cran.r-project.org/package=hagis)
[![codecov](https://codecov.io/gh/openplantpathology/hagis/branch/master/graph/badge.svg)](https://codecov.io/gh/openplantpathology/hagis)
[![codecov](https://codecov.io/gh/openplantpathology/hagis/branch/main/graph/badge.svg)](https://codecov.io/gh/openplantpathology/hagis)
[![DOI](https://zenodo.org/badge/164751172.svg)](https://zenodo.org/badge/latestdoi/164751172)
<!-- badges: end -->
## Introduction
Expand Down Expand Up @@ -39,7 +39,7 @@ install.packages("hagis")

A development version is available from from GitHub.
If you wish to install the development version that may have new features or bug fixes before the CRAN version does (but also may not work properly), please install the remotes package, available from CRAN.
We strive to keep the master branch on GitHub functional and working properly.
We strive to keep the main branch on GitHub functional and working properly.

``` r
if (!require("remotes")) {
Expand Down Expand Up @@ -80,7 +80,7 @@ citation("hagis")
#> 'options(citation.bibtex.max=999)'.
```

Please note that the *hagis* project is released with a [Contributor Code of Conduct](https://github.com/openplantpathology/hagis/blob/master/CODE_OF_CONDUCT.md).
Please note that the *hagis* project is released with a [Contributor Code of Conduct](https://github.com/openplantpathology/hagis/blob/main/CODE_OF_CONDUCT.md).
By contributing to this project, you agree to abide by its terms.

## References
Expand Down

0 comments on commit 98bf5b8

Please sign in to comment.