From 8cf5a22bcb398c261bd02ef3908c8d4a08ba6f83 Mon Sep 17 00:00:00 2001
From: Scott Charlton <charlton@usgs.gov>
Date: Wed, 29 Sep 2021 16:33:06 -0600
Subject: [PATCH] Update cmake.yml

working on getting to work both in jenkins and github-actions.
---
 .github/workflows/cmake.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index e6cd0251..11e3f85d 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -102,18 +102,16 @@ jobs:
           use-public-rspm: true
 
       - name: install devtools
-        run: |
-          install.packages("devtools")
-        shell: Rscript {0}
+        run: Rscript -e 'install.packages("devtools")'
 
       - name: versioning
         run: ./jenkins-dist.sh -v ${{ needs.init.outputs.VER }} -r ${{ needs.init.outputs.REL }} -d ${{ needs.init.outputs.DATE }}
 
       - name: check
-        run: cd R && make check
+        run: cd R/phreeqc && Rscript -e 'devtools::check()'
 
       - name: build
-        run: cd R && make build
+        run: cd R/phreeqc && Rscript -e 'devtools::build()'
 
       - uses: actions/upload-artifact@v2
         with: