Ignore a vignette failure on legacy windows

ropensci · Sep 24, 2023 · 3f32278 · 3f32278
1 parent c6a06c0
commit 3f32278
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
@@ -17,7 +17,7 @@ jobs:
       matrix:
         config:
           - {os: macOS-latest,   r: 'release'}
-          - {os: windows-latest, r: '4.1'}
+          - {os: windows-latest, r: '4.1', build_args: '"--no-build-vignettes"'}
           - {os: windows-latest, r: '4.2'}
           - {os: windows-latest, r: 'release'}
           - {os: windows-latest,   r: 'devel'}
@@ -47,3 +47,4 @@ jobs:
       - uses: r-lib/actions/check-r-package@v2
         with:
           args: 'c("--no-manual", "--as-cran", "--run-donttest")'
+          build_args: ${{ matrix.config.build_args || '"--no-manual"' }}
diff --git a/src/Makevars.win b/src/Makevars.win
@@ -1,5 +1,5 @@
 RWINLIB = ../windows/imagemagick
-LIBBUILD = lib${subst gcc ,-,${R_COMPILED_BY}}${R_ARCH}
+OLDLIBDIR = lib${subst gcc,,${COMPILED_BY}}${R_ARCH}
 
 PKG_CPPFLAGS = \
 	-I$(RWINLIB)/include-config${R_ARCH} \
@@ -8,7 +8,7 @@ PKG_CPPFLAGS = \
 PKG_CXXFLAGS = -DMAGICKCORE_HDRI_ENABLE=0 -DMAGICKCORE_QUANTUM_DEPTH=16 -D_LIB
 
 PKG_LIBS = \
-	-L$(RWINLIB)/$(LIBBUILD) \
+	-L$(RWINLIB)/$(OLDLIBDIR) \
 	-L$(RWINLIB)/lib \
 	-lMagick++-6.Q16 -lMagickWand-6.Q16 -lMagickCore-6.Q16 \
 	-lraw -lheif -lde265 -lx265 -laom \