From b4aa81fa76b81734261a1eba37c43570772575bf Mon Sep 17 00:00:00 2001 From: "Charlton, Scott R" Date: Sun, 5 Mar 2023 16:11:39 -0700 Subject: [PATCH] pre-commit changes use $ pre-commit run --all-files --- .gitlab-ci.yml | 2 +- Makefile.am | 2 +- phreeqcpp/.gitlab-ci.yml | 4 ++-- phreeqcpp/Makefile.am | 2 +- phreeqcpp/common/.gitlab-ci.yml | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 10dced62..436f26da 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 diff --git a/Makefile.am b/Makefile.am index bd994e65..0df5eef3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,7 @@ EXTRA_DIST=\ phreeqcpp/CurveObject.h\ phreeqcpp/Form1.h\ 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 diff --git a/phreeqcpp/.gitlab-ci.yml b/phreeqcpp/.gitlab-ci.yml index 9c8a9fed..dd622b85 100644 --- a/phreeqcpp/.gitlab-ci.yml +++ b/phreeqcpp/.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/phreeqcpp/Makefile.am b/phreeqcpp/Makefile.am index a568ea8c..013912c0 100644 --- a/phreeqcpp/Makefile.am +++ b/phreeqcpp/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/phreeqcpp/common/.gitlab-ci.yml b/phreeqcpp/common/.gitlab-ci.yml index 408cc696..6487156b 100644 --- a/phreeqcpp/common/.gitlab-ci.yml +++ b/phreeqcpp/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