max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-15 16:18:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

updated versioning

Browse Source
This commit is contained in:
Charlton, Scott R 2021-09-29 16:15:35 -06:00
parent d64894ec91
commit e9c1c7591d
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
jenkins-R-dist.sh
View File

@ -7,6 +7,7 @@ if [ -z "$DATE" ]; then
DATE=$(date "+%x")
fi
DATE=$(date -d $DATE --rfc-3339=date)
export DATE
#
# set VER
@ -14,11 +15,10 @@ DATE=$(date -d $DATE --rfc-3339=date)
if [ -z "$VER" ]; then
###wget https://cran.r-project.org/package=phreeqc -O index.xhtml 2> /dev/null
###VER=`xmlstarlet sel -t -m "/_:html/_:body/_:table[1]/_:tr[1]/_:td[2]" -v . -n index.xhtml 2> /dev/null`
VER=$(curl https://raw.githubusercontent.com/usgs-coupled/phreeqc-version/main/phreeqc-version.txt)
VER=$(curl -sS https://raw.githubusercontent.com/usgs-coupled/phreeqc-version/main/next_ver.sh | sh)
ver_major=$(echo "$VER" | cut -d '.' -f 1)
ver_minor=$(echo "$VER" | cut -d '.' -f 2)
ver_patch=$(echo "$VER" | cut -d '.' -f 3)
ver_patch=$((ver_patch+1))
else
ver_major=$(echo "$VER" | cut -d '.' -f 1)
ver_minor=$(echo "$VER" | cut -d '.' -f 2)
@ -33,14 +33,16 @@ export VER
#
# set REL
#
curl https://raw.githubusercontent.com/usgs-coupled/phreeqc-version/main/ver.py -o ver.py
HEAD=$(python3 ver.py)
if [ -z "$REL" ]; then
REL="$HEAD"
fi
# curl https://raw.githubusercontent.com/usgs-coupled/phreeqc-version/main/ver.py -o ver.py
# HEAD=$(python3 ver.py)
# if [ -z "$REL" ]; then
# REL="$HEAD"
# fi
REL=$(curl -sS https://raw.githubusercontent.com/usgs-coupled/phreeqc-version/main/rel.py | python3)
export REL
# sed files
/bin/sh jenkins-dist.sh -v ${VER} -r ${REL} -d ${DATE} -pr ${TAG}
cd R
make VERSION=${VER} RELEASE_DATE=${DATE} build
make VERSION=${VER} RELEASE_DATE=${DATE} check
make VERSION=${VER} RELEASE_DATE=${DATE} build