-
Notifications
You must be signed in to change notification settings - Fork 218
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[setup-r]: macOS: unlink pre-installed pkg-config (#953)
* Add debug to R-devel workflow [ci skip] * Include brew output [ci skip] * macOS: try to unlink pre-installed pkg-config It conflicts with the new pkgconf version that we are trying to install, and which should be the default going forward. #948 * Update NEWS * Update npm deps for setup-r Removed source map, for CodeQL. I can't please it otherwise... * Still need older ncc Hopefully this'll be enough. * Patch generated file manually Wow. * Hand-edit generated file for CodeQL
- Loading branch information
1 parent
e8c6069
commit 473c681
Showing
8 changed files
with
70 additions
and
79 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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", "[email protected]" ], | ||
{ 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", [ | ||
|
@@ -258,7 +269,7 @@ async function acquireUtilsMacOS() { | |
"pkgconfig", | ||
"checkbashisms", | ||
"ghostscript", | ||
], { silent: true }); | ||
], { silent: false }); | ||
} catch (error) { | ||
core.debug(`${error}`); | ||
|
||
|