From 1770b0cf3d1ae9de67ae97f48ffe5a5b30aee67c Mon Sep 17 00:00:00 2001 From: David Li Date: Tue, 26 Mar 2024 12:38:24 -0400 Subject: [PATCH] chore: fix R build on macOS in verification (#1672) See "Newer C++ features with old SDK" in https://conda-forge.org/docs/maintainer/knowledge_base/ --- .github/workflows/nightly-verify.yml | 7 +++++++ r/adbcsqlite/src/Makevars.in | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/nightly-verify.yml b/.github/workflows/nightly-verify.yml index fb0cf30a60..14263b8836 100644 --- a/.github/workflows/nightly-verify.yml +++ b/.github/workflows/nightly-verify.yml @@ -18,6 +18,13 @@ name: Verification (Nightly) on: + pull_request: + branches: + - main + paths: + - '.github/workflows/nightly-verify.yml' + - 'dev/release/verify-release-candidate.sh' + - 'dev/release/verify-release-candidate.ps1' schedule: - cron: "0 0 * * *" workflow_dispatch: {} diff --git a/r/adbcsqlite/src/Makevars.in b/r/adbcsqlite/src/Makevars.in index 84669a5ab9..bd1e4419a1 100644 --- a/r/adbcsqlite/src/Makevars.in +++ b/r/adbcsqlite/src/Makevars.in @@ -16,7 +16,7 @@ # under the License. CXXSTD = CXX17 -PKG_CPPFLAGS=-I../src/ -I../src/c/ -I../src/c/vendor/ -I../src/c/vendor/fmt/include/ @cppflags@ -DADBC_EXPORT="" -DFMT_HEADER_ONLY=1 +PKG_CPPFLAGS=-I../src/ -I../src/c/ -I../src/c/vendor/ -I../src/c/vendor/fmt/include/ @cppflags@ -DADBC_EXPORT="" -DFMT_HEADER_ONLY=1 -D_LIBCPP_DISABLE_AVAILABILITY PKG_LIBS=@libs@ OBJECTS = init.o \