Skip to content

Commit cc75f2c

Browse files
committed
Make macOS R installation sequential
Hopefully this solves installer hangs.
1 parent 61009b5 commit cc75f2c

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

setup-r/lib/installer.js

+3-5
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,9 @@ function acquireR(version, rtoolsVersion) {
102102
]);
103103
}
104104
else if (IS_MAC) {
105-
yield Promise.all([
106-
acquireFortranMacOS(),
107-
acquireUtilsMacOS(),
108-
acquireRMacOS(version)
109-
]);
105+
yield acquireFortranMacOS();
106+
yield acquireUtilsMacOS();
107+
yield acquireRMacOS(version);
110108
if (core.getInput("remove-openmp-macos") === "true") {
111109
yield removeOpenmpFlags();
112110
}

setup-r/src/installer.ts

+3-5
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,9 @@ async function acquireR(version: string, rtoolsVersion: string) {
7070
acquireQpdfWindows()
7171
]);
7272
} else if (IS_MAC) {
73-
await Promise.all([
74-
acquireFortranMacOS(),
75-
acquireUtilsMacOS(),
76-
acquireRMacOS(version)
77-
]);
73+
await acquireFortranMacOS();
74+
await acquireUtilsMacOS();
75+
await acquireRMacOS(version);
7876
if (core.getInput("remove-openmp-macos") === "true") {
7977
await removeOpenmpFlags();
8078
}

0 commit comments

Comments
 (0)