diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index aae3066..08ffbef 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -2,9 +2,9 @@ # Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help on: push: - branches: [main, master] + branches: [main] pull_request: - branches: [main, master] + branches: [main] name: R-CMD-check diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml index af05320..0343ea9 100644 --- a/.github/workflows/pkgdown.yaml +++ b/.github/workflows/pkgdown.yaml @@ -2,9 +2,9 @@ # Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help on: push: - branches: [main, master] + branches: [main] pull_request: - branches: [main, master] + branches: [main] release: types: [published] workflow_dispatch: diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml index 960234c..cf8133b 100644 --- a/.github/workflows/test-coverage.yaml +++ b/.github/workflows/test-coverage.yaml @@ -2,9 +2,9 @@ # Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help on: push: - branches: [main, master] + branches: [main] pull_request: - branches: [main, master] + branches: [main] name: test-coverage diff --git a/CODE_DESIGN.md b/CODE_DESIGN.md index c08eb7f..e3bedb8 100644 --- a/CODE_DESIGN.md +++ b/CODE_DESIGN.md @@ -14,10 +14,10 @@ This is a collection of developer notes and is by no means exhaustive or correct ## Versioning There 3-4 different `motus` versions on GitHub at any one time: -- `master` branch - Current release - e.g., v4.0.3 +- `main` branch - Current release - e.g., v4.0.3 - `betaX` branch - Current minor dev - e.g., v4.0.3.9000 - `sandbox` branch - Current major dev - e.g., v4.0.3.9999 -- `hotfix-` branch - Current quick fixes to merge in to master quickly v4.0.3.9001 (increments one greater than `betaX`) +- `dev`/`hotfix-` branch - Current quick fixes to merge in to main quickly v4.0.3.9001 (increments one greater than `betaX`) ## Naming Conventions diff --git a/README.md b/README.md index ce889f3..8e782d0 100644 --- a/README.md +++ b/README.md @@ -2,14 +2,14 @@ [![:name status badge](https://birdscanada.r-universe.dev/badges/:name)](https://birdscanada.r-universe.dev/) [![motus status badge](https://birdscanada.r-universe.dev/badges/motus)](https://birdscanada.r-universe.dev/motus) [![R-CMD-check](https://github.com/MotusWTS/motus/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/MotusWTS/motus/actions/workflows/R-CMD-check.yaml) -[![Codecov test coverage](https://app.codecov.io/gh/MotusWTS/motus/branch/master/graph/badge.svg)](https://app.codecov.io/gh/MotusWTS/motus?branch=master) +[![Codecov test coverage](https://app.codecov.io/gh/MotusWTS/motus/branch/main/graph/badge.svg)](https://app.codecov.io/gh/MotusWTS/motus?branch=main) # motus

- Birds Canada Logo showing grey text 'Birds Canada' and 'Oiseaux Canada' on either side of a grey and yellow bird perched on a branch - Motus Logo showing blue text 'Motus Wildlife Tracking System' to the right of pale green images of a bat, bird and dragonfly at the ends of green curved lines + Birds Canada Logo showing grey text 'Birds Canada' and 'Oiseaux Canada' on either side of a grey and yellow bird perched on a branch + Motus Logo showing blue text 'Motus Wildlife Tracking System' to the right of pale green images of a bat, bird and dragonfly at the ends of green curved lines

An R package for handling [Motus](https://motus.org) automated radio-telemetry data. diff --git a/RELEASE.R b/RELEASE.R index 2a3d9ad..2b6b7e6 100644 --- a/RELEASE.R +++ b/RELEASE.R @@ -3,22 +3,22 @@ # The motus project works with three(ish) main branches: # -# - master - currently released version of motus (e.g., v3.0.0) +# - main - currently released version of motus (e.g., v3.0.0) # - hotfix/dev - minor work using current API version (e.g., v3.0.0.9000) # - beta - minor work for the next minor API release (e.g., v3.0.0.9900) # - sandbox - major work for the next major API release (e.g., v3.0.0.9990) # # Merges may occur as follows: # -# beta --> master +# beta --> main # beta --> sandbox -# sandbox --> master +# sandbox --> main # -# hotfix --> master +# hotfix --> main # hotfix --> beta # hotfix --> sandbox # -# When merging changes to master: +# When merging changes to main: # # - Change api url to https://motus.org/api (in z.onLoad.R) # - Change version to correct (non-dev) version (in DESCRIPTION) @@ -27,13 +27,13 @@ # - GitHub pull request, make sure tests pass, merge # - Sign release # -# # When merging changes from master to sandbox: +# # When merging changes from main to sandbox: # # - git checkout sandbox (sandbox branch) -# - git merge master --no-ff --no-commit (sandbox branch) -# - Revert API url to (i.e. should be sandbox url, not point to master) -# - Revert VERSION number (i.e. keep sandbox version, not master version) -# - Commit changes as merge with master +# - git merge main --no-ff --no-commit (sandbox branch) +# - Revert API url to (i.e. should be sandbox url, not point to main) +# - Revert VERSION number (i.e. keep sandbox version, not main version) +# - Commit changes as merge with main # - Check dates on updatesql, sandbox changes should be 'later' than beta # # # When merging changes in beta to sandbox: @@ -44,10 +44,10 @@ # - Revert VERSION number (i.e. keep sandbox version, not beta version) # - Committ changes as merge with betaX # -# # After releasing a new version (i.e. all changes into master) +# # After releasing a new version (i.e. all changes into main) # # - Delete beta and sandbox locally and on GitHub -# - Create beta and sandbox from master +# - Create beta and sandbox from main # - Update versions (X.X.X.9900 and X.X.X.9990) # - Update apis (in z.onLoad.R) to https://beta.motus.org/api and https://sandbox.motus.org/api # - Add `# motus beta dev` and `# motus sandbox dev` headings to NEWS @@ -117,9 +117,9 @@ devtools::check_win_oldrelease() ## Push to GitHub ---------------------------------------------------- -## Push to master branch (pull request, etc.) +## Push to main branch (pull request, etc.) -## Update API package version to current (only for master) ----------- +## Update API package version to current (only for main) ----------- # - Must use personal access srvAPIinfo() srvQuery(API = "custom/update_pkg_version", params = list(pkgVersion = "6.0.1")) diff --git a/_pkgdown.yml b/_pkgdown.yml index fd1d172..e3447ec 100644 --- a/_pkgdown.yml +++ b/_pkgdown.yml @@ -87,7 +87,7 @@ articles: navbar: ~ desc: "This is a complete walk-through, originally compiled as the Motus R book. These articles are largely based on the original Motus R Book by - [Crewe et al. 2018](https://raw.githubusercontent.com/MotusWTS/motus/master/inst/extdata/MotusRBook2018-01.pdf), + [Crewe et al. 2018](https://raw.githubusercontent.com/MotusWTS/motus/main/inst/extdata/MotusRBook2018-01.pdf), and have since been supplemented by [various people on the Motus team](01-introduction.html#acknowledgements)." contents: - articles/01-introduction diff --git a/vignettes/articles/01-introduction.Rmd b/vignettes/articles/01-introduction.Rmd index b961aa7..4f16548 100644 --- a/vignettes/articles/01-introduction.Rmd +++ b/vignettes/articles/01-introduction.Rmd @@ -77,7 +77,7 @@ Department of Biology, Western University, Canada ## Acknowledgements -These articles are largely based on the original Motus R Book by [Crewe et al. 2018](https://raw.githubusercontent.com/MotusWTS/motus/master/inst/extdata/MotusRBook2018-01.pdf), and have been supplemented by numerous Motus collaborators and Birds Canada Motus staff. +These articles are largely based on the original Motus R Book by [Crewe et al. 2018](https://raw.githubusercontent.com/MotusWTS/motus/main/inst/extdata/MotusRBook2018-01.pdf), and have been supplemented by numerous Motus collaborators and Birds Canada Motus staff. Motus is an international collaborative research network that uses coordinated automated radio telemetry to facilitate research and education on the ecology and conservation of small organisms. Motus is a program of Birds Canada in partnership with collaborating researchers and organizations. The Motus website includes a list of [Motus partners and collaborators](https://motus.org/data/partners). If your organization is not listed, please contact .