Skip to content

Commit

Permalink
Need to build typescript
Browse files Browse the repository at this point in the history
  • Loading branch information
jimhester committed Apr 9, 2020
1 parent 57b16e6 commit 7fe5cad
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions setup-r/lib/installer.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,11 @@ function acquireR(version, rtoolsVersion) {
]);
}
else if (IS_MAC) {
yield Promise.all([acquireFortranMacOS(), acquireQpdfMacOS(), acquireRMacOS(version)]);
yield Promise.all([
acquireFortranMacOS(),
acquireQpdfMacOS(),
acquireRMacOS(version)
]);
if (core.getInput("remove-openmp-macos")) {
yield removeOpenmpFlags();
}
Expand Down Expand Up @@ -314,7 +318,7 @@ function acquireRtools(version) {
function acquireQpdfWindows() {
return __awaiter(this, void 0, void 0, function* () {
try {
yield exec.exec("choco", ["install", "qpdf"]);
yield exec.exec("choco", ["install", "qpdf", "--no-progress"]);
}
catch (error) {
core.debug(error);
Expand Down Expand Up @@ -352,7 +356,7 @@ function getFileNameMacOS(version) {
}
function getDownloadUrlMacOS(version) {
if (version == "devel") {
return "https://mac.r-project.org/high-sierra/R-devel/R-devel.pkg";
return "http://mac.r-project.org/el-capitan/R-devel/R-devel-el-capitan-signed.pkg";
}
const filename = getFileNameMacOS(version);
if (semver.eq(version, "3.2.5")) {
Expand Down

0 comments on commit 7fe5cad

Please sign in to comment.