Skip to content

Commit

Permalink
Debugging
Browse files Browse the repository at this point in the history
  • Loading branch information
robomics committed Feb 8, 2024
1 parent 1c33b0b commit c31a420
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 18 deletions.
19 changes: 2 additions & 17 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ on:

env:
CONAN_HOME: "${{ github.workspace }}/conan/"
MACOS_MIN_VERSION: 10.15

# https://stackoverflow.com/a/72408109
concurrency:
Expand All @@ -48,8 +47,8 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [windows-latest, macos-latest, ubuntu-latest]
r-version: ["3.6.3", "4.0.5", "4.1.3", "4.2.3", "4.3.2"]
os: [macos-latest]
r-version: ["4.0.5"]

runs-on: ${{ matrix.os }}

Expand Down Expand Up @@ -83,20 +82,6 @@ jobs:
extra-packages: any::rcmdcheck
needs: check

- name: Generate cache key
id: cache-key
run: |
hash="${{ hashFiles('conanfile.txt', '.github/workflows/ci.yml') }}"
echo "conan-key=ci-$hash" >> $GITHUB_OUTPUT
- name: Restore Conan cache
id: cache-conan
uses: actions/cache/restore@v3
with:
key: conan-${{ steps.cache-key.outputs.conan-key }}
path: ${{ env.CONAN_HOME }}

- name: Build and test package
uses: r-lib/actions/check-r-package@v2

Expand Down
8 changes: 7 additions & 1 deletion src/Makevars
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ export CONAN_HOME := $(PWD)/conan-staging/.conan2
export CC = "$(shell "$(R_HOME)/bin/Rscript" -e 'Sys.which("gcc")')"
export CXX = "$(shell "$(R_HOME)/bin/Rscript" -e 'Sys.which("g++")')"


CONANDEPS_MK := $(shell ../run_conan.py)
include $(CONANDEPS_MK)

Expand All @@ -17,3 +16,10 @@ PKG_CPPFLAGS := $(PKG_CPPFLAGS) $(shell "$(R_HOME)/bin/Rscript" -e 'Rcpp:::CxxFl
PKG_LIBS := $(addprefix -L ,$(CONAN_LIB_DIRS))
PKG_LIBS := $(PKG_LIBS) $(addprefix -l,$(CONAN_LIBS))
PKG_LIBS := $(PKG_LIBS) $(addprefix -l,$(CONAN_SYSTEM_LIBS))

OS := $(shell uname 2>/dev/null || echo Unknown)

ifeq ($(OS),Darwin)
export MACOSX_DEPLOYMENT_TARGET = 10.15
CXXFLAGS += -mmacosx-version-min=10.15
endif

0 comments on commit c31a420

Please sign in to comment.