From 85f07339daeeb95ed3e74cb5e47e42128430e40c Mon Sep 17 00:00:00 2001 From: CGMossa Date: Sat, 7 Sep 2024 12:42:46 +0200 Subject: [PATCH 1/2] [minor] Use same variable in `Makevars` file (#358) * use the same variable as in other Makevars templates * ci fix: snapshot updated --------- Co-authored-by: Ilia Kosenkov --- inst/templates/Makevars | 2 +- tests/testthat/_snaps/use_cran_defaults.md | 2 +- tests/testthat/_snaps/use_extendr.md | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/inst/templates/Makevars b/inst/templates/Makevars index 18cc5a06..07ed90f4 100644 --- a/inst/templates/Makevars +++ b/inst/templates/Makevars @@ -27,4 +27,4 @@ C_clean: rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) clean: - rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) rust/target + rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) $(TARGET_DIR) diff --git a/tests/testthat/_snaps/use_cran_defaults.md b/tests/testthat/_snaps/use_cran_defaults.md index 6a19be7a..e3065b31 100644 --- a/tests/testthat/_snaps/use_cran_defaults.md +++ b/tests/testthat/_snaps/use_cran_defaults.md @@ -66,7 +66,7 @@ rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) clean: - rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) rust/target + rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) $(TARGET_DIR) --- diff --git a/tests/testthat/_snaps/use_extendr.md b/tests/testthat/_snaps/use_extendr.md index 5e2349e5..92d25e84 100644 --- a/tests/testthat/_snaps/use_extendr.md +++ b/tests/testthat/_snaps/use_extendr.md @@ -72,7 +72,7 @@ rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) clean: - rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) rust/target + rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) $(TARGET_DIR) --- @@ -284,5 +284,5 @@ rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) clean: - rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) rust/target + rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) $(TARGET_DIR) From 0359070b1a57116e39523209fe4345f689fbccdf Mon Sep 17 00:00:00 2001 From: Alberson Miranda <45690517+albersonmiranda@users.noreply.github.com> Date: Sat, 7 Sep 2024 10:18:17 -0300 Subject: [PATCH 2/2] update CI workflows so that they are triggered by changing PR status from draft to ready (#383) Co-authored-by: CGMossa --- .github/workflows/R-CMD-check.yaml | 5 +++++ .github/workflows/lint.yaml | 5 +++++ .github/workflows/pkgdown.yaml | 5 +++++ .github/workflows/test-coverage.yaml | 5 +++++ .github/workflows/test_pkg_gen.yaml | 13 +++++++------ 5 files changed, 27 insertions(+), 6 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index c9310b18..6e9a8aee 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -3,6 +3,11 @@ on: branches: [main, master] pull_request: branches: [main, master] + types: + - opened + - reopened + - synchronize + - ready_for_review name: R-CMD-check diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index f4c4ef2d..88110fe7 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -5,6 +5,11 @@ on: branches: [main, master] pull_request: branches: [main, master] + types: + - opened + - reopened + - synchronize + - ready_for_review name: lint diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml index 071ab3e6..66ae6728 100644 --- a/.github/workflows/pkgdown.yaml +++ b/.github/workflows/pkgdown.yaml @@ -5,6 +5,11 @@ on: branches: [main, master] pull_request: branches: [main, master] + types: + - opened + - reopened + - synchronize + - ready_for_review release: types: [published] workflow_dispatch: diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml index 44c75e97..7d32bd81 100644 --- a/.github/workflows/test-coverage.yaml +++ b/.github/workflows/test-coverage.yaml @@ -5,6 +5,11 @@ on: branches: [main, master] pull_request: branches: [main, master] + types: + - opened + - reopened + - synchronize + - ready_for_review name: test-coverage diff --git a/.github/workflows/test_pkg_gen.yaml b/.github/workflows/test_pkg_gen.yaml index 1292929f..31826280 100644 --- a/.github/workflows/test_pkg_gen.yaml +++ b/.github/workflows/test_pkg_gen.yaml @@ -1,12 +1,13 @@ on: push: - branches: - - main - - master + branches: [main, master] pull_request: - branches: - - main - - master + branches: [main, master] + types: + - opened + - reopened + - synchronize + - ready_for_review name: Test package generation