mirror of
https://git.gfz-potsdam.de/naaice/iphreeqc.git
synced 2025-12-16 00:28:23 +01:00
Squashed 'phreeqcpp/' changes from f8cd55c..eb35357
eb35357 Merge pull request #17 from scharlton2/bmi-working 26a26c1 pre-commit changes use $ pre-commit run --all-files git-subtree-dir: phreeqcpp git-subtree-split: eb35357c1291b425b97f8bae8a62d5a888a6d4e3
This commit is contained in:
parent
bc9ab58d16
commit
772c30924f
@ -18,7 +18,7 @@ before_script:
|
||||
- chmod 644 ~/.ssh/known_hosts
|
||||
- git config --global user.email "darth@empire.com"
|
||||
- git config --global user.name "Darth Vader"
|
||||
|
||||
|
||||
subtree-sync:
|
||||
stage: sync
|
||||
|
||||
@ -34,7 +34,7 @@ subtree-sync:
|
||||
- master
|
||||
variables:
|
||||
- $GROUP
|
||||
|
||||
|
||||
script:
|
||||
##
|
||||
## Must re-clone in order for the subtree merge to work
|
||||
|
||||
@ -8,7 +8,7 @@ EXTRA_DIST=\
|
||||
Form1.h\
|
||||
Form1.2005.resX\
|
||||
Form1.resX\
|
||||
ZedGraph.dll
|
||||
ZedGraph.dll
|
||||
|
||||
AM_CPPFLAGS=-I$(top_srcdir)/src -I$(top_srcdir)/src/common -I$(top_srcdir)/src/PhreeqcKeywords
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@ before_script:
|
||||
- chmod 644 ~/.ssh/known_hosts
|
||||
- git config --global user.email "darth@empire.com"
|
||||
- git config --global user.name "Darth Vader"
|
||||
|
||||
|
||||
trigger-downstream:
|
||||
stage: trigger
|
||||
##
|
||||
@ -41,6 +41,6 @@ trigger-downstream:
|
||||
- curl -X POST -F token=${PHREEQC3_SRC_TRIGGER} -F ref=master https://code.chs.usgs.gov/api/v4/projects/${PHREEQC3_SRC_ID}/trigger/pipeline
|
||||
- echo triggering wphast
|
||||
- curl -X POST -F token=${WPHAST_TRIGGER} -F ref=master https://code.chs.usgs.gov/api/v4/projects/${WPHAST_ID}/trigger/pipeline
|
||||
|
||||
|
||||
## Upstream Projects
|
||||
## none
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user