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

Merge commit '3ce6dfc59f237dc8788541d444a25693102a7208'

Browse Source
This commit is contained in:
Darth Vader 2021-10-31 18:58:46 +00:00
commit cc2c985afa
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phreeqcpp/.gitlab-ci.yml
View File

@ -1,6 +1,7 @@
# #
# https://code.chs.usgs.gov/coupled/subtrees/phreeqc3-src # https://code.chs.usgs.gov/coupled/subtrees/phreeqc3-src
# SRC 2020-12-02T18:39:55-07:00 # SRC 2020-12-02T18:39:55-07:00
# SRC 2021-10-31T12:53:15-06:00 -- changed pull to squash -- HEAD:2243d25babbc524e7875b3d591bb6b91c4399a95
# #
image: ${CI_REGISTRY}/coupled/containers/buildpack-deps:bionic-scm image: ${CI_REGISTRY}/coupled/containers/buildpack-deps:bionic-scm
@ -72,7 +73,8 @@ subtree-sync:
export GIT_EDITOR=true export GIT_EDITOR=true
for remote in "${!urls[@]}"; do for remote in "${!urls[@]}"; do
git_subtree "pull" "${prefixes[$remote]}" "$remote" "${urls[$remote]}" # git_subtree "pull" "${prefixes[$remote]}" "$remote" "${urls[$remote]}"
git subtree pull --prefix "${prefixes[$remote]}" --squash "${urls[$remote]}" master
done done
for remote in "${!urls[@]}"; do for remote in "${!urls[@]}"; do