resolve conflicts

TolisChal · Oct 16, 2023 · c248779 · c248779
2 parents 30db634 + 157955c
commit c248779
Show file tree

Hide file tree

Showing 3 changed files with 2,464 additions and 5 deletions.
diff --git a/.github/workflows/R-CMD-check-ubuntu.yml b/.github/workflows/R-CMD-check-ubuntu.yml
@@ -22,8 +22,8 @@ jobs:
         config:
          - {os: ubuntu-latest,  r: 'devel'}
          - {os: ubuntu-latest,  r: 'release'}
-         - {os: ubuntu-18.04,   r: 'devel'}
-         - {os: ubuntu-18.04,   r: 'release'}
+         - {os: ubuntu-20.04,   r: 'devel'}
+         - {os: ubuntu-20.04,   r: 'release'}
 
     env:
       R_REMOTES_NO_ERRORS_FROM_WARNINGS: true

diff --git a/cran_gen/genCRANpkg.R b/cran_gen/genCRANpkg.R
@@ -42,9 +42,8 @@ dir_lp = paste0(path,"/lpSolveAPI/inst/include")
 h_files = dir(dir_lp, "*.h", ignore.case = TRUE, all.files = TRUE)
 lp_dist = paste0(path,"/external/LPsolve_src/include")
 file.copy(file.path(dir_lp, h_files), lp_dist, recursive=TRUE, overwrite=TRUE)
-
-file.copy(paste0(path,"/external/cmake-files/lp_rlp.h"), lp_dist, recursive=TRUE, overwrite=TRUE)
-
+# replace the lpsolve header file that issues a warning in mac's cran test
+file.copy(paste0(path,"/external/cmake-files/lpsolve_modified_header_files/lp_rlp.h"), lp_dist, recursive=TRUE, overwrite=TRUE)
 dir_lp = paste0(path,"/lpSolve/src")
 h_files = dir(dir_lp, "*.h", ignore.case = TRUE, all.files = TRUE)
 lp_dist = paste0(path,"/external/LPsolve_src/run_headers")