From f2ba6b97ad250bc53f95e7ac6e8eb4fa6624ecfe Mon Sep 17 00:00:00 2001 From: Darth Vader Date: Tue, 7 Mar 2023 02:48:24 +0000 Subject: [PATCH] Squashed 'src/' changes from f8cd55c2..eb35357c 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 --- .gitlab-ci.yml | 4 ++-- Makefile.am | 2 +- common/.gitlab-ci.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9c8a9fed6..dd622b853 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 diff --git a/Makefile.am b/Makefile.am index a568ea8cb..013912c0d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 diff --git a/common/.gitlab-ci.yml b/common/.gitlab-ci.yml index 408cc696f..6487156bc 100644 --- a/common/.gitlab-ci.yml +++ b/common/.gitlab-ci.yml @@ -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