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

Merge commit '1a19a99b23a31a1268b50af5429b3a89ee8e6a84'

Browse Source
This commit is contained in:
Darth Vader 2023-03-07 02:43:15 +00:00
commit 38db9f9ecc
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -18,7 +18,7 @@ before_script:
- chmod 644 ~/.ssh/known_hosts - chmod 644 ~/.ssh/known_hosts
- git config --global user.email "darth@empire.com" - git config --global user.email "darth@empire.com"
- git config --global user.name "Darth Vader" - git config --global user.name "Darth Vader"
subtree-sync: subtree-sync:
stage: sync stage: sync

2
Makefile.am
View File

@ -21,7 +21,7 @@ EXTRA_DIST=\
phreeqcpp/CurveObject.h\ phreeqcpp/CurveObject.h\
phreeqcpp/Form1.h\ phreeqcpp/Form1.h\
phreeqcpp/Form1.resX\ phreeqcpp/Form1.resX\
phreeqcpp/ZedGraph.dll phreeqcpp/ZedGraph.dll
AM_CPPFLAGS=-I$(top_srcdir)/src -I$(top_srcdir)/src/phreeqcpp -I$(top_srcdir)/src/phreeqcpp/common -I$(top_srcdir)/src/phreeqcpp/PhreeqcKeywords AM_CPPFLAGS=-I$(top_srcdir)/src -I$(top_srcdir)/src/phreeqcpp -I$(top_srcdir)/src/phreeqcpp/common -I$(top_srcdir)/src/phreeqcpp/PhreeqcKeywords

4
phreeqcpp/.gitlab-ci.yml
View File

@ -18,7 +18,7 @@ before_script:
- chmod 644 ~/.ssh/known_hosts - chmod 644 ~/.ssh/known_hosts
- git config --global user.email "darth@empire.com" - git config --global user.email "darth@empire.com"
- git config --global user.name "Darth Vader" - git config --global user.name "Darth Vader"
subtree-sync: subtree-sync:
stage: sync stage: sync
@ -34,7 +34,7 @@ subtree-sync:
- master - master
variables: variables:
- $GROUP - $GROUP
script: script:
## ##
## Must re-clone in order for the subtree merge to work ## Must re-clone in order for the subtree merge to work

2
phreeqcpp/Makefile.am
View File

@ -8,7 +8,7 @@ EXTRA_DIST=\
Form1.h\ Form1.h\
Form1.2005.resX\ Form1.2005.resX\
Form1.resX\ Form1.resX\
ZedGraph.dll ZedGraph.dll
AM_CPPFLAGS=-I$(top_srcdir)/src -I$(top_srcdir)/src/common -I$(top_srcdir)/src/PhreeqcKeywords AM_CPPFLAGS=-I$(top_srcdir)/src -I$(top_srcdir)/src/common -I$(top_srcdir)/src/PhreeqcKeywords

4
phreeqcpp/common/.gitlab-ci.yml
View File

@ -16,7 +16,7 @@ before_script:
- chmod 644 ~/.ssh/known_hosts - chmod 644 ~/.ssh/known_hosts
- git config --global user.email "darth@empire.com" - git config --global user.email "darth@empire.com"
- git config --global user.name "Darth Vader" - git config --global user.name "Darth Vader"
trigger-downstream: trigger-downstream:
stage: trigger 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 - 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 - 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 - curl -X POST -F token=${WPHAST_TRIGGER} -F ref=master https://code.chs.usgs.gov/api/v4/projects/${WPHAST_ID}/trigger/pipeline
## Upstream Projects ## Upstream Projects
## none ## none