Skip to content

Commit fe7af12

Browse files
committed
Test parallel make
1 parent ab50c9d commit fe7af12

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

.github/workflows/R-CMD-check.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@ jobs:
2222
- {os: windows-latest, r: '4.3', FORCE_STATIC_GIFSKI: 'static'}
2323
- {os: windows-latest, r: 'release'}
2424
- {os: windows-latest, r: 'release', FORCE_STATIC_GIFSKI: 'static'}
25+
- {os: windows-latest, r: 'devel'}
2526
- {os: macOS-13, r: 'release'}
2627
- {os: macOS-14, r: 'release'}
28+
- {os: macOS-15, r: 'next'}
2729
- {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
2830
- {os: ubuntu-24.04, r: 'release'}
2931
- {os: ubuntu-22.04, r: 'release'}
@@ -59,3 +61,4 @@ jobs:
5961
upload-results: true
6062
env:
6163
FORCE_STATIC_GIFSKI: ${{ matrix.config.FORCE_STATIC_GIFSKI }}
64+
MAKEFLAGS: -j4

cleanup.win

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cleanup

src/Makevars.ucrt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ $(STATLIB):
1414
rm -Rf $(LIBDIR)/build
1515

1616
cleanup: $(SHLIB)
17-
rm -Rf $(STATLIB) myrustlib/target
17+
@rm -Rf $(STATLIB) myrustlib/target

src/Makevars.win

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@ PKG_LIBS = -L$(RWINLIB)/lib \
99
-L$(RWINLIB)/lib$(R_ARCH) \
1010
-lgifski -lws2_32 -ladvapi32 -luserenv -ldbghelp -lbcrypt $(NTDLL)
1111

12-
all: clean winlibs
12+
all: $(SHLIB) cleanup
13+
14+
$(OBJECTS): winlibs
1315

1416
winlibs:
1517
"${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" "../tools/winlibs.R"
1618

17-
clean:
18-
rm -f $(SHLIB) $(OBJECTS)
19+
cleanup: $(SHLIB)
20+
@rm -Rf $(RWINLIB)

0 commit comments

Comments
 (0)