From a36ac2bd7400f3926bee5f59646d7182f3eeebcf Mon Sep 17 00:00:00 2001 From: "Zhian N. Kamvar" Date: Tue, 24 May 2022 10:47:38 -0700 Subject: [PATCH 1/2] update pr-recieve workflow --- DESCRIPTION | 2 +- NEWS.md | 8 ++++++++ inst/workflows/README.md | 3 ++- inst/workflows/pr-receive.yaml | 1 + 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index ce83f9d92..b30dd1036 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: sandpaper Title: Create and Curate Carpentries Lessons -Version: 0.5.5 +Version: 0.5.6 Authors@R: c( person(given = "Zhian N.", family = "Kamvar", diff --git a/NEWS.md b/NEWS.md index cdb7882e9..fcb4f961d 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,11 @@ +# sandpaper 0.5.6 + +CONTINUOUS INTEGRATION +---------------------- + +* Pull requests will now report on elements of the lesson that do not pass + checks. + # sandpaper 0.5.5 MISC diff --git a/inst/workflows/README.md b/inst/workflows/README.md index 20dbd80a0..bef22e405 100644 --- a/inst/workflows/README.md +++ b/inst/workflows/README.md @@ -117,7 +117,7 @@ pull requests that do not pass checks and do not have bots commented on them.** This series of workflows all go together and are described in the following diagram and the below sections: -![Graph representation of a pull request](https://raw.githubusercontent.com/zkamvar/stunning-barnacle/main/img/pr-flow.dot.svg) +![Graph representation of a pull request](../../vignettes/articles/img/pr-flow.dot.svg) ### Recieve Pull Request (pr-recieve.yaml) @@ -143,6 +143,7 @@ process as the sandpaper-main workflow with the same caching mechanisms. The artifacts produced are used by the next workflow. +# sandpaper 0.5.5 ### Comment on Pull Request (pr-comment.yaml) This workflow is triggered if the `pr-recieve.yaml` workflow is successful. diff --git a/inst/workflows/pr-receive.yaml b/inst/workflows/pr-receive.yaml index d97878823..072322f94 100644 --- a/inst/workflows/pr-receive.yaml +++ b/inst/workflows/pr-receive.yaml @@ -65,6 +65,7 @@ jobs: id: build-site run: | sandpaper::package_cache_trigger(TRUE) + sandpaper::validate_lesson() sandpaper:::build_markdown(path = '${{ github.workspace }}', quiet = FALSE) shell: Rscript {0} From 63a941feabf13895ba2258e2df8142284ac75328 Mon Sep 17 00:00:00 2001 From: "Zhian N. Kamvar" Date: Tue, 24 May 2022 18:09:17 -0700 Subject: [PATCH 2/2] make things a bit more explicit --- inst/workflows/pr-receive.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inst/workflows/pr-receive.yaml b/inst/workflows/pr-receive.yaml index 072322f94..9b1c1cf0c 100644 --- a/inst/workflows/pr-receive.yaml +++ b/inst/workflows/pr-receive.yaml @@ -61,11 +61,11 @@ jobs: with: cache-version: ${{ secrets.CACHE_VERSION }} - - name: "Build Site" + - name: "Validate and Build Markdown" id: build-site run: | sandpaper::package_cache_trigger(TRUE) - sandpaper::validate_lesson() + sandpaper::validate_lesson(path = '${{ github.workspace }}') sandpaper:::build_markdown(path = '${{ github.workspace }}', quiet = FALSE) shell: Rscript {0}