Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: r-lib/actions
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.11.2
Choose a base ref
...
head repository: r-lib/actions
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v2.11.3
Choose a head ref
  • 5 commits
  • 5 files changed
  • 3 contributors

Commits on Mar 10, 2025

  1. Fix typo in pak-version param description (#989)

    Bisaloo authored Mar 10, 2025
    Copy the full SHA
    813ef1c View commit details

Commits on Mar 19, 2025

  1. codecov/codecov-action v4->v5 (#984)

    * codecov/codecov-action v4->v5
    
    * Use updated argument names
    
    ---------
    
    Co-authored-by: Gábor Csárdi <csardi.gabor@gmail.com>
    MichaelChirico and gaborcsardi authored Mar 19, 2025

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    c8e6990 View commit details
  2. Support Rtools45 (#992)

    gaborcsardi authored Mar 19, 2025
    Copy the full SHA
    41634eb View commit details
  3. Run brew silently, warnings trigger annotations (#993)

    Closes #991 I think.
    gaborcsardi authored Mar 19, 2025
    Copy the full SHA
    12d8dd4 View commit details

Commits on Mar 24, 2025

  1. Update NEWS for v2.11.3 (#997)

    gaborcsardi authored Mar 24, 2025
    Copy the full SHA
    bd49c52 View commit details
Showing with 36 additions and 13 deletions.
  1. +5 −0 NEWS.md
  2. +3 −3 examples/test-coverage.yaml
  3. +1 −1 setup-r-dependencies/action.yaml
  4. +1 −1 setup-r/dist/index.js
  5. +26 −8 setup-r/src/installer.ts
5 changes: 5 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@

# `v2.11.3` (2025-03-24)

* `[setup-r]` now supports Rtools45, and installs it by default
for R >= 4.5.0.

# `v2.11.2` (2025-02-19)

* `[setup-r]` now installs gfortran 14.2 for R 4.5.0 and later (#965).
6 changes: 3 additions & 3 deletions examples/test-coverage.yaml
Original file line number Diff line number Diff line change
@@ -38,12 +38,12 @@ jobs:
covr::to_cobertura(cov)
shell: Rscript {0}

- uses: codecov/codecov-action@v4
- uses: codecov/codecov-action@v5
with:
# Fail if error if not on PR, or if on PR and token is given
fail_ci_if_error: ${{ github.event_name != 'pull_request' || secrets.CODECOV_TOKEN }}
file: ./cobertura.xml
plugin: noop
files: ./cobertura.xml
plugins: noop
disable_search: true
token: ${{ secrets.CODECOV_TOKEN }}

2 changes: 1 addition & 1 deletion setup-r-dependencies/action.yaml
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ inputs:
to the library where pak is installed.
`repo` means that the action will install pak from the configured
repositories, using `install.packages()`. `repo` is appropriate on
systems that do not have access to our pak reporitory on GitHUb.
systems that do not have access to our pak repository on GitHub.
default: 'stable'
working-directory:
description: 'Using the working-directory keyword, you can specify the working directory of where "pkg_deps" command searches for dependencies in the "DESCRIPTION" file.'
2 changes: 1 addition & 1 deletion setup-r/dist/index.js

Large diffs are not rendered by default.

34 changes: 26 additions & 8 deletions setup-r/src/installer.ts
Original file line number Diff line number Diff line change
@@ -270,7 +270,7 @@ async function acquireUtilsMacOS() {
"pkgconfig",
"checkbashisms",
"ghostscript",
], { silent: false });
], { silent: true });
} catch (error) {
core.debug(`${error}`);

@@ -472,7 +472,11 @@ async function acquireRWindows(version: IRVersion): Promise<string> {
}

function getRtoolsUrl(version: string): string {
if (version == "44" && ARCH == "arm64") {
if (version == "45" && ARCH == "arm64") {
return "https://github.com/r-hub/rtools45/releases/download/latest/rtools45-aarch64.exe";
} else if (version == "45") {
return "https://github.com/r-hub/rtools45/releases/download/latest/rtools45.exe";
} else if (version == "44" && ARCH == "arm64") {
return "https://github.com/r-hub/rtools44/releases/download/latest/rtools44-aarch64.exe";
} else if (version == "44") {
return "https://github.com/r-hub/rtools44/releases/download/latest/rtools44.exe";
@@ -503,16 +507,18 @@ async function acquireRtools(version: IRVersion) {
}

const versionNumber = parseInt(rtoolsVersion || "error");
const rtools44 = versionNumber >= 44;
const rtools43 = !rtools44 && versionNumber >= 43;
const rtools42 = !rtools44 && !rtools43 && versionNumber >= 41;
const rtools40 = !rtools44 && !rtools43 && !rtools42 && versionNumber >= 40;
const rtools3x = !rtools44 && !rtools43 && !rtools42 && !rtools40;
const rtools45 = versionNumber >= 45;
const rtools44 = !rtools45 && versionNumber >= 44;
const rtools43 = !rtools45 && !rtools44 && versionNumber >= 43;
const rtools42 = !rtools45 && !rtools44 && !rtools43 && versionNumber >= 41;
const rtools40 = !rtools45 && !rtools44 && !rtools43 && !rtools42 && versionNumber >= 40;
const rtools3x = !rtools45 && !rtools44 && !rtools43 && !rtools42 && !rtools40;
var fileName = path.basename(downloadUrl);

// If Rtools is already installed just return, as there is a message box
// which hangs the build otherwise.
if (
(rtools45 && fs.existsSync("C:\\Rtools45")) ||
(rtools44 && fs.existsSync("C:\\Rtools44")) ||
(rtools43 && fs.existsSync("C:\\Rtools43")) ||
(rtools42 && fs.existsSync("C:\\Rtools42")) ||
@@ -547,7 +553,19 @@ async function acquireRtools(version: IRVersion) {
// we never want patches (by default)
let addpath = core.getInput("windows-path-include-rtools") === "true";
core.exportVariable("_R_INSTALL_TIME_PATCHES_", "no");
if (rtools44) {
if (rtools45) {
if (addpath) {
if (ARCH == "arm64") {
core.addPath(`C:\\rtools45-aarch64\\usr\\bin`);
core.addPath(
`C:\\rtools45-aarch64\\aarch64-w64-mingw32.static.posix\\bin`,
);
} else {
core.addPath(`C:\\rtools45\\usr\\bin`);
core.addPath(`C:\\rtools45\\x86_64-w64-mingw32.static.posix\\bin`);
}
}
} else if (rtools44) {
if (addpath) {
if (ARCH == "arm64") {
core.addPath(`C:\\rtools44-aarch64\\usr\\bin`);