Merge pull request rqtl#231 from kbroman/cran

Fix compiler warning on CRAN
kbroman · Nov 28, 2023 · b92e9e6 · b92e9e6
2 parents 5a3ed6c + a8f28f8
commit b92e9e6
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git 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, master, cran]
   pull_request:
-    branches: [main, master]
+    branches: [main, master, cran]
 
 name: R-CMD-check
 

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: qtl2
-Version: 0.33-6
-Date: 2023-11-12
+Version: 0.34
+Date: 2023-11-28
 Title: Quantitative Trait Locus Mapping in Experimental Crosses
 Description: Provides a set of tools to perform quantitative
     trait locus (QTL) analysis in experimental crosses. It is a

diff --git a/NEWS.md b/NEWS.md
@@ -1,4 +1,4 @@
-## qtl2 0.33-6 (2023-11-12)
+## qtl2 0.34 (2023-11-28)
 
 ### Major changes
 
@@ -20,6 +20,10 @@
 - More fully explain the use of weights in `est_herit()` and
   `scan1()`. (Issue #221)
 
+### Bug fixes
+
+- Deal with new compiler warning on CRAN. (Issue #230)
+
 
 ## qtl2 0.32 (2023-04-21)
 

diff --git a/src/r_message.cpp b/src/r_message.cpp
@@ -12,7 +12,7 @@ void r_message(std::string text)
 void r_warning(std::string text)
 {
     const char *text_c = text.c_str();
-    Rf_warning(text_c);
+    Rf_warning("%s", text_c);
 }
 
 // Following based on code from Luke Miratrix, http://bit.ly/rcpp_assert