Skip to content

Commit

Permalink
Squashed 'src/' changes from f8cd55c2..eb35357c
Browse files Browse the repository at this point in the history
eb35357c Merge pull request #17 from scharlton2/bmi-working
26a26c13 pre-commit changes use $ pre-commit run --all-files

git-subtree-dir: src
git-subtree-split: eb35357c1291b425b97f8bae8a62d5a888a6d4e3
  • Loading branch information
Darth Vader committed Mar 7, 2023
1 parent 64e516b commit f2ba6b9
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -34,7 +34,7 @@ subtree-sync:
- master
variables:
- $GROUP

script:
##
## Must re-clone in order for the subtree merge to work
Expand Down
2 changes: 1 addition & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions common/.gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
##
Expand All @@ -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

0 comments on commit f2ba6b9

Please # to comment.