simplified

This commit is contained in:
Charlton, Scott R 2021-09-22 16:27:02 -06:00
parent 85ed08045a
commit 7eac510adf

View File

@ -121,19 +121,21 @@ jobs:
install.packages("devtools")
shell: Rscript {0}
- name: versioning
run: ./jenkins-dist.sh -v ${{ needs.init.outputs.VER }} -r ${{ needs.init.outputs.REL }} -d ${{ needs.init.outputs.DATE }}
run: ./jenkins-R-dist.sh -v ${{ needs.init.outputs.VER }} -r ${{ needs.init.outputs.REL }} -d ${{ needs.init.outputs.DATE }}
- name: R
run: |
cd R
mkdir -p phreeqc/man
mkdir -p phreeqc/src/phreeqcpp
mkdir -p phreeqc/R
mkdir -p phreeqc/data
echo "# Generated by roxygen2: do not edit by hand" > phreeqc/NAMESPACE
DATE=$(date -d ${{ needs.init.outputs.DATE }} "+%Y-%m-%d")
make VERSION=${{ needs.init.outputs.VER }} RELEASE_DATE=$DATE build
# - name: versioning
# run: ./jenkins-dist.sh -v ${{ needs.init.outputs.VER }} -r ${{ needs.init.outputs.REL }} -d ${{ needs.init.outputs.DATE }}
# - name: R
# run: |
# cd R
# mkdir -p phreeqc/man
# mkdir -p phreeqc/src/phreeqcpp
# mkdir -p phreeqc/R
# mkdir -p phreeqc/data
# echo "# Generated by roxygen2: do not edit by hand" > phreeqc/NAMESPACE
# DATE=$(date -d ${{ needs.init.outputs.DATE }} "+%Y-%m-%d")
# make VERSION=${{ needs.init.outputs.VER }} RELEASE_DATE=$DATE build
- uses: actions/upload-artifact@v2
with: