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

Squashed 'phreeqcpp/' changes from 2243d25..7e50e98

Browse Source 
7e50e98 Merge commit 'df6addc21acd81411e81b36a9daf373b10cba255'
df6addc Squashed 'common/' changes from 077abe0..013c822
5bc41df git subtree pull now squashes

git-subtree-dir: phreeqcpp
git-subtree-split: 7e50e9840fd9a15a541345f02fbcbfed5b09dd8e
This commit is contained in:
Darth Vader 2021-10-31 18:57:52 +00:00
parent b8745514b6
commit a330bc51e3
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@ -1,6 +1,7 @@
#
# https://code.chs.usgs.gov/coupled/subtrees/phreeqc3-src
# 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
@ -72,7 +73,8 @@ subtree-sync:
export GIT_EDITOR=true
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
for remote in "${!urls[@]}"; do