Skip to content

Commit

Permalink
test on 3.6 on Windows
Browse files Browse the repository at this point in the history
  • Loading branch information
jeroen committed Oct 6, 2024
1 parent 32be402 commit 44a1e4e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 10 deletions.
10 changes: 1 addition & 9 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,12 @@ jobs:
fail-fast: false
matrix:
config:
- {os: macOS-13, r: 'release'}
- {os: macOS-14, r: 'release'}
- {os: macOS-latest, r: 'release', disable-static: 'disable-static'}
- {os: windows-latest, r: '3.6'}
- {os: windows-latest, r: '4.0'}
- {os: windows-latest, r: '4.1'}
- {os: windows-latest, r: '4.2'}
- {os: windows-latest, r: '4.3'}
- {os: windows-latest, r: '4.4'}
- {os: windows-2022, r: 'devel'}
- {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
- {os: ubuntu-latest, r: 'release'}
- {os: ubuntu-24.04, r: 'release', disable-static: 'disable-static'}
- {os: ubuntu-22.04, r: 'release', disable-static: 'disable-static'}
- {os: ubuntu-20.04, r: 'release', disable-static: 'disable-static'}

env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
Expand Down
5 changes: 4 additions & 1 deletion src/Makevars.win
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,12 @@ RWINLIB = ../windows/libv8
ifeq ($(R_COMPILED_BY),gcc 8.3.0)
RWINLIB = ../windows/libv8$(R_ARCH)
endif
ifeq ($(R_COMPILED_BY),gcc 4.9.3)
LEGACYFLAGS = -DISNODEJS=6.2
endif

# Enables pointer compression except for on 32-bit (legacy)
PKG_CPPFLAGS = -I$(RWINLIB)/include -DV8_COMPRESS_POINTERS$(subst 64,,$(WIN))
PKG_CPPFLAGS = -I$(RWINLIB)/include -DV8_COMPRESS_POINTERS$(subst 64,,$(WIN)) $(LEGACYFLAGS)
PKG_LIBS = \
-L$(RWINLIB)/lib \
-lv8_monolith \
Expand Down

0 comments on commit 44a1e4e

Please sign in to comment.