Merge pull request #408 from cmu-delphi/ds/ci2

testing

Author: dshemetov

.github/pull_request_template.md

@@ -1,16 +1,21 @@
 ### Checklist
 
 Please:
-- [ ] Make sure this PR is against "dev", not "main".
-- [ ] Request a review from one of the current epiprocess main reviewers:
-      brookslogan, nmdefries.
-- [ ] Describe changes made in NEWS.md, making sure breaking changes
-      (backwards-incompatible changes to the documented interface) are noted.
-      The right location for this may be in flux (see
-      [here](https://github.com/cmu-delphi/epiprocess/pull/398)).
+
+-   [ ] Make sure this PR is against "dev", not "main".
+-   [ ] Request a review from one of the current epiprocess main reviewers:
+        brookslogan, nmdefries.
+-   [ ] Makes sure to bump the version number in `DESCRIPTION` and `NEWS.md`.
+        Always increment the patch version number (the third number), unless you are
+        making a release PR from dev to main, in which case increment the minor
+        version number (the second number).
+-   [ ] Describe changes made in NEWS.md, making sure breaking changes
+        (backwards-incompatible changes to the documented interface) are noted.
+        Collect the changes under the next release number (e.g. if you are on
+        0.7.2, then write your changes under the 0.8 heading).
 
 ### Change explanations for reviewer
 
 ### Magic GitHub syntax to mark associated Issue(s) as resolved when this is merged into the default branch
 
-- Resolves #{issue number}
+-   Resolves #{issue number}

.github/workflows/auto_semver_bump.yaml

@@ -41,10 +41,10 @@ jobs:
         env:
           DELPHI_EPIDATA_KEY: ${{ secrets.SECRET_EPIPROCESS_GHACTIONS_DELPHI_EPIDATA_KEY }}
         run: |
-          if (startsWith("${{ GITHUB_EVENT_NAME }}", "pull_request")) {
-              mode <- ifelse("${{ GITHUB_BASE_REF }}" == "main", "release", "devel")
+          if (startsWith("${{ github.event_name }}", "pull_request")) {
+              mode <- ifelse("${{ github.base_ref }}" == "main", "release", "devel")
           } else {
-              mode <- ifelse("${{ GITHUB_REF_NAME }}" == "main", "release", "devel")
+              mode <- ifelse("${{ github.ref_name }}" == "main", "release", "devel")
           }
           pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE, override=list(PKGDOWN_DEV_MODE=mode))
         shell: Rscript {0}

.github/workflows/pkgdown.yaml

@@ -35,25 +35,22 @@ R -e 'devtools::document()'
 python -m http.server -d docs
 ```
 
-For `pkgdown` to correctly generate both public (`main`) and `dev` documentation sites, the package version in `DESCRIPTION` on `dev` must have four components, and be of the format `x.x.x.9000`. The package version on `main` must be in the format `x.x.x`.
-
-The documentation website is updated on push or pull request to the `main` and `dev` branches.
+## Versioning
+
+Please follow the guidelines in the PR template document (reproduced here):
+
+-   [ ] Make sure this PR is against "dev", not "main".
+-   [ ] Request a review from one of the current epiprocess main reviewers:
+        brookslogan, nmdefries.
+-   [ ] Makes sure to bump the version number in `DESCRIPTION` and `NEWS.md`.
+        Always increment the patch version number (the third number), unless you are
+        making a release PR from dev to main, in which case increment the minor
+        version number (the second number).
+-   [ ] Describe changes made in NEWS.md, making sure breaking changes
+        (backwards-incompatible changes to the documented interface) are noted.
+        Collect the changes under the next release number (e.g. if you are on
+        0.7.2, then write your changes under the 0.8 heading).
 
 ## Release process
 
-### Manual
-
 TBD
-
-### Automated (currently unavailable)
-
-The release consists of multiple steps which can be all done via the GitHub website:
-
-1. Go to [create_release GitHub Action](https://github.com/cmu-delphi/epidatr/actions/workflows/create_release.yml) and click the `Run workflow` button. Enter the next version number or one of the magic keywords (patch, minor, major) and hit the green `Run workflow` button.
-2. The action will prepare a new release and will end up with a new [Pull Request](https://github.com/cmu-delphi/epidatr/pulls)
-3. Let the code owner review the PR and its changes and let the CI check whether everything builds successfully
-4. Once approved and merged, another GitHub action job starts which automatically will
-   1. create a git tag
-   2. create another [Pull Request](https://github.com/cmu-delphi/epidatr/pulls) to merge the changes back to the `dev` branch
-   3. create a [GitHub release](https://github.com/cmu-delphi/epidatr/releases) with automatically derived release notes
-5. Release to CRAN

DEVELOPMENT.md

@@ -1,15 +1,20 @@
-# epiprocess 0.7.2.9999
+# epiprocess
+
+Pre-1.0.0 numbering scheme: 0.x will indicate releases, while 0.x.y will indicate PR's.
+
+# epiprocess 0.8
 
 ## Improvements
 
 * `epi_slide` computations are now 2-4 times faster after changing how
   reference time values, made accessible within sliding functions, are
   calculated (#397).
+* regenerated the `jhu_csse_daily_subset` dataset with the latest versions of
+  the data from the API
+* changed approach to versioning, see DEVELOPMENT.md for details
 
 # epiprocess 0.7.1.9999
 
-Pre-1.0.0 numbering scheme: 0.x will indicate releases, while 0.7.x will indicate PR's.
-
 ## Breaking changes
 
 * Switched `epi_df`'s `other_keys` default from `NULL` to `character(0)`; PR #390
@@ -25,8 +30,6 @@ Pre-1.0.0 numbering scheme: 0.x will indicate releases, while 0.7.x will indicat
 
 * Updated vignettes for compatibility with epidatr 1.0.0 in PR #377.
 
-# epiprocess 0.7.0
-
 ## Breaking changes
 
 * Changes to `epi_slide` and `epix_slide`: