Updated source target

reordered r-build steps
This commit is contained in:
Charlton, Scott R 2023-01-13 11:46:06 -07:00
parent 7421064ffd
commit 49d5fb6b00
2 changed files with 5 additions and 5 deletions

View File

@ -100,15 +100,15 @@ jobs:
- name: versioning
run: ./jenkins-dist.sh -v ${{ needs.init.outputs.VER }} -r ${{ needs.init.outputs.REL }} -d ${{ needs.init.outputs.DATE }}
- name: create source
working-directory: R
run: make VERSION=${VER} RELEASE_DATE=${DATE} source
- name: Setup R
uses: r-lib/actions/setup-r@v2
with:
use-public-rspm: true
- name: create source
working-directory: R
run: make VERSION=${VER} RELEASE_DATE=${DATE} source
- name: Install dependencies
uses: r-lib/actions/setup-r-dependencies@v2
with:

View File

@ -272,7 +272,7 @@ DATA = \
all: $(PSRC) $(XSRC) $(DATA) $(MAN)/phreeqc-package.Rd
source: $(PSRC) $(XSRC) $(DATA)
source: $(TOPDIR)/R/phreeqc.R $(TOPDIR)/DESCRIPTION $(TOPDIR)/NAMESPACE $(PSRC) $(XSRC) $(DATA)
$(DATADIR)/databases.rda : $(DBS) build-databases.R
rm -f .RData