mirror of
https://git.gfz-potsdam.de/naaice/iphreeqc.git
synced 2025-12-15 16:18:22 +01:00
Updated source target
reordered r-build steps
This commit is contained in:
parent
7421064ffd
commit
49d5fb6b00
8
.github/workflows/cmake.yml
vendored
8
.github/workflows/cmake.yml
vendored
@ -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:
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user