Skip to content

Commit fb6325b

Browse files
committed
update docker and mac gha
1 parent d5ace36 commit fb6325b

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ jobs:
4040
uses: r-lib/actions/setup-pandoc@v2
4141

4242
- name: Setup R
43+
if: matrix.config.name != 'r-devel-linux-x86_64-debian-clang'
4344
uses: r-lib/actions/setup-r@v2
4445
with:
4546
r-version: ${{ matrix.config.r }}
@@ -67,6 +68,12 @@ jobs:
6768
choco install tesseract
6869
choco install poppler
6970
71+
- name: Install system dependencies (MacOS)
72+
if: matrix.config.os == 'macos-13' || matrix.config.os == 'macos-14'
73+
run: |
74+
brew install tesseract
75+
brew install poppler
76+
7077
- name: Run on Ubuntu
7178
if: matrix.config.os == 'ubuntu-latest' || matrix.config.os == 'ubuntu-24.04' || matrix.config.os == 'ubuntu-22.04' || matrix.config.os == 'ubuntu-20.04'
7279
uses: r-lib/actions/check-r-package@v2
@@ -78,3 +85,4 @@ jobs:
7885
- name: Run on Windows
7986
if: matrix.config.os == 'windows-latest'
8087
uses: r-lib/actions/check-r-package@v2
88+

src/Makevars.win

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,7 @@ clean:
2929
rm -f $(OBJECTS) $(SHLIB)
3030

3131
winlibs:
32-
mkdir -p ../inst
33-
"${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" "../tools/winlibs.R" ${VERSION}
34-
cp -Rf ../windows/tessdata ../inst/
35-
cp -Rf ${TESSERACT_RWINLIB}/share/tessdata ../inst/
32+
"${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" "../tools/winlibs.R"
3633
rm -Rf ../inst/share && mkdir -p ../inst/share
3734
cp -Rf $(POPPLER_RWINLIB)/$(POPPLERDATA) ../inst/share/poppler
3835

0 commit comments

Comments
 (0)