simpler check, tabs in makevars

ischlo · Oct 30, 2024 · d3da36b · d3da36b
1 parent 9a5233b
commit d3da36b
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 22 deletions.
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
@@ -2,9 +2,9 @@
 # Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
 on:
   push:
-    branches: [main, master]
+    branches: [main]
   pull_request:
-    branches: [main, master]
+    branches: [main]
 
 name: R-CMD-check
 
@@ -22,9 +22,9 @@ jobs:
         config:
           - {os: macos-latest,   r: 'release'}
           - {os: windows-latest, r: 'release'}
-          - {os: ubuntu-latest,   r: 'devel', http-user-agent: 'release'}
+          # - {os: ubuntu-latest,   r: 'devel', http-user-agent: 'release'}
           - {os: ubuntu-latest,   r: 'release'}
-          - {os: ubuntu-latest,   r: 'oldrel-1'}
+          # - {os: ubuntu-latest,   r: 'oldrel-1'}
 
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -12,6 +12,7 @@ BugReports: https://github.com/ischlo/cppRosm/issues
 Imports: 
     cli,
     data.table,
+    dplyr,
     glue,
     parallel,
     processx,

diff --git a/src/Makevars b/src/Makevars
@@ -7,23 +7,21 @@ PKG_CPPFLAGS = -Ilibosmium/include -Iprotozero/include
 $(SHLIB): libosmium protozero
 
 protozero:
-        (cd protozero; \
-          CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" \
-          CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \
-	  cmake . \
-	    -DCMAKE_BUILD_TYPE=Release \
-	    -DBUILD_SHARED_LIBS:bool=OFF \
-	    -DCMAKE_POSITION_INDEPENDENT_CODE:bool=ON; \
-	  $(MAKE))
-
-
+	(cd protozero; \
+	CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" \
+  CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \
+  cmake . \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DBUILD_SHARED_LIBS:bool=OFF \
+    -DCMAKE_POSITION_INDEPENDENT_CODE:bool=ON; \
+	$(MAKE))
 
 libosmium:
-        (cd libosmium; \
-          CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" \
-          CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \
-	  cmake . \
-	    -DCMAKE_BUILD_TYPE=Release \
-	    -DBUILD_SHARED_LIBS:bool=OFF \
-	    -DCMAKE_POSITION_INDEPENDENT_CODE:bool=ON; \
-	  $(MAKE))
+	(cd libosmium; \
+  CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" \
+  CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \
+  cmake . \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DBUILD_SHARED_LIBS:bool=OFF \
+    -DCMAKE_POSITION_INDEPENDENT_CODE:bool=ON; \
+  $(MAKE))