Skip to content

Commit

Permalink
macOS: try to unlink pre-installed pkg-config
Browse files Browse the repository at this point in the history
It conflicts with the new pkgconf version that
we are trying to install, and which should be
the default going forward.

#948
  • Loading branch information
gaborcsardi committed Nov 25, 2024
1 parent 0dad2da commit d8dd4a4
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 2 deletions.
2 changes: 1 addition & 1 deletion setup-r/dist/index.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion setup-r/dist/index.js.map

Large diffs are not rendered by default.

11 changes: 11 additions & 0 deletions setup-r/src/installer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,17 @@ async function acquireFortranMacOSOld(): Promise<string> {

async function acquireUtilsMacOS() {
// qpdf is needed by `--as-cran`
// https://github.com/r-lib/actions/issues/948
try {
process.env.HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK = "true";
await exec.exec(
"brew",
[ "unlink", "pkg-config@0.29.2" ],
{ silent: false }
);
} catch (error) {
// ignore error, in case it is not pre-installed in the future
}
try {
process.env.HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK = "true";
await exec.exec("brew", [
Expand Down

0 comments on commit d8dd4a4

Please sign in to comment.