diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 2f3f8f4..9de2e67 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -5,22 +5,28 @@ on: branches: [main, master] pull_request: branches: [main, master] - workflow_dispatch: + workflow_dispatch: {} name: R-CMD-check jobs: R-CMD-check: runs-on: macos-latest + strategy: + fail-fast: false + matrix: + R: [ 'release', 'next' ] env: GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} R_KEEP_PKG_SOURCE: yes + name: R ${{ matrix.R }} sample steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: r-lib/actions/setup-r@v2 with: use-public-rspm: true + r-version: ${{ matrix.R }} - uses: r-lib/actions/setup-r-dependencies@v2 with: diff --git a/NEWS.md b/NEWS.md index a0a93a7..c202948 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,6 +2,12 @@ ## Features +- Updated to support R 4.4.0 on macOS. + +## Deployment + +- GitHub Actions now tests the package on `release` and `next` versions of + macOS R's version. # macrtools 0.0.3 diff --git a/R/gfortran.R b/R/gfortran.R index 3e096ef..d763b24 100644 --- a/R/gfortran.R +++ b/R/gfortran.R @@ -187,7 +187,7 @@ gfortran_install = function(password = getOption("macrtools.password"), verbose gfortran_status = FALSE - if(is_r_version("4.3")) { + if(is_r_version("4.3") || is_r_version("4.4")) { gfortran_status = install_gfortran_12_2_universal( password = entered_password_gfortran, verbose = verbose) @@ -219,7 +219,7 @@ gfortran_install = function(password = getOption("macrtools.password"), verbose version_number = paste(R.version$major, R.version$minor, sep = ".") cat( paste0( - "The macrtools package supports gfortran installations for R 4.0.* - R 4.3.*.\nThe installed version of R (", version_number, ") is not yet supported!\n" + "The macrtools package supports gfortran installations for R 4.0.* - R 4.4.*.\nThe installed version of R (", version_number, ") is not yet supported!\n" ) ) return(invisible(FALSE)) @@ -320,7 +320,7 @@ gfortran_update = function(password = getOption("macrtools.password"), verbose = assert_mac() assert_aarch64() assert(is_gfortran_installed(), "On gfortran") - assert(is_r_version("4.2") || is_r_version("4.3"), "On R 4.2 or above") + assert(is_r_version("4.2") || is_r_version("4.3") || is_r_version("4.4"), "On R 4.2 or above") # Figure out installation directory install_dir = install_location() diff --git a/R/installers.R b/R/installers.R index 5fb2f59..28470ff 100644 --- a/R/installers.R +++ b/R/installers.R @@ -14,7 +14,7 @@ install_strip_level = function(arch = system_arch()) { } recipe_binary_install_strip_level = function(arch = system_arch()) { - if (is_r_version("4.3")) { + if (is_r_version("4.3") || is_r_version("4.4")) { switch( arch, "arm64" = 3, @@ -42,7 +42,7 @@ install_location = function(arch = system_arch()) { } recipe_binary_install_location = function(arch = system_arch()) { - if (is_r_version("4.3")) { + if (is_r_version("4.3") || is_r_version("4.4")) { switch( arch, "arm64" = install_directory_arm64(), @@ -58,7 +58,7 @@ recipe_binary_install_location = function(arch = system_arch()) { } gfortran_install_location = function(arch = system_arch()) { - if (is_r_version("4.3")) { + if (is_r_version("4.3") || is_r_version("4.4")) { "/opt" } else if (is_r_version("4.0") | is_r_version("4.1") | is_r_version("4.2")) { install_location()