Skip to content

Commit

Permalink
Install pkg-config on MacOS
Browse files Browse the repository at this point in the history
  • Loading branch information
jeroen authored and jimhester committed Apr 13, 2020
1 parent 155c137 commit a38b6a7
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions setup-r/lib/installer.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ function acquireR(version, rtoolsVersion) {
else if (IS_MAC) {
yield Promise.all([
acquireFortranMacOS(),
acquireQpdfMacOS(),
acquireUtilsMacOS(),
acquireRMacOS(version)
]);
if (core.getInput("remove-openmp-macos")) {
Expand Down Expand Up @@ -126,11 +126,11 @@ function acquireFortranMacOS() {
}
});
}
function acquireQpdfMacOS() {
function acquireUtilsMacOS() {
return __awaiter(this, void 0, void 0, function* () {
// qpdf is needed by `--as-cran`
try {
yield exec.exec("brew", ["install", "qpdf"]);
yield exec.exec("brew", ["install", "qpdf", "pkgconfig"]);
}
catch (error) {
core.debug(error);
Expand Down
6 changes: 3 additions & 3 deletions setup-r/src/installer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ async function acquireR(version: string, rtoolsVersion: string) {
} else if (IS_MAC) {
await Promise.all([
acquireFortranMacOS(),
acquireQpdfMacOS(),
acquireUtilsMacOS(),
acquireRMacOS(version)
]);
if (core.getInput("remove-openmp-macos")) {
Expand Down Expand Up @@ -104,10 +104,10 @@ async function acquireFortranMacOS() {
}
}

async function acquireQpdfMacOS() {
async function acquireUtilsMacOS() {
// qpdf is needed by `--as-cran`
try {
await exec.exec("brew", ["install", "qpdf"]);
await exec.exec("brew", ["install", "qpdf", "pkgconfig"]);
} catch (error) {
core.debug(error);

Expand Down

0 comments on commit a38b6a7

Please sign in to comment.