Darth Vader
4327dd3a1f
Merge commit '2a2134b55c12b9f96b44a15f8fa6fd7f88a72c7c'
2023-03-07 00:58:59 +00:00
Darth Vader
8e3d93040a
Squashed 'phreeqc3-doc/' changes from a321fbd6..8925f6c3
...
8925f6c3 updated RELEASE.TXT, revised PR_P and PR_PHI functions and the test case PR_error_incremental
git-subtree-dir: phreeqc3-doc
git-subtree-split: 8925f6c3e593af286eddce71943a535afa7b7a3f
2023-03-07 00:58:57 +00:00
Darth Vader
8534959170
Merge commit '8e3d93040af90c9c0c57e0ee8ad0dee0625746d6'
2023-03-07 00:58:57 +00:00
Darth Vader
15c997e314
Squashed 'src/' changes from 9b9ee1b0..ec1947dc
...
ec1947dc Merge commit 'c85a9cde6d9bf3f7841b3bc9b87c18e1012df0c9'
c85a9cde Squashed 'phreeqcpp/' changes from e9db33b..0b60d1a
git-subtree-dir: src
git-subtree-split: ec1947dcfe62d83054d56433ec3b563e70326879
2023-03-07 00:43:16 +00:00
Darth Vader
4ca24e3c11
Merge commit '15c997e31499728d7beb32a621ef522b1c72799a'
2023-03-07 00:43:16 +00:00
Darth Vader
40a732a06a
Merge commit '9fac4a5659c122db2b529cd16deef696af1496e6'
2023-03-07 00:41:53 +00:00
Darth Vader
9fac4a5659
Squashed 'src/' changes from 6e14dda9..9b9ee1b0
...
9b9ee1b0 Closes usgs-coupled/phreeqcrm#12 (#13 )
git-subtree-dir: src
git-subtree-split: 9b9ee1b061d2245ad878072c4cd01f6140ca11d8
2023-03-07 00:41:52 +00:00
Charlton, Scott R
1cce50d505
Merge remote-tracking branch 'origin/master'
2023-02-18 13:22:53 -07:00
Scott R Charlton
ff9bf81347
reset AC_PREREQ
2023-02-18 13:17:56 -07:00
Charlton, Scott R
d30cfee5e2
Merge pull request #25 from scharlton2/22-some-replace-not-correctly-replaced-in-tarball
...
Missed versioning CMakeLists.txt
2023-02-17 20:03:58 -07:00
Charlton, Scott R
159038eb37
Missed CMakeLists.txt
2023-02-17 19:20:59 -07:00
Charlton, Scott R
b160fa2da7
Merge pull request #24 from scharlton2/22-some-replace-not-correctly-replaced-in-tarball
...
* Updated jenkins-dist.sh
* Updated configure.ac using autoupdate 2.71 on ubuntu 22.02.1
2023-02-17 17:09:17 -07:00
Charlton, Scott R
b7badcaa37
[iphreeqc] Closes usgs-coupled/iphreeqc#22
...
updated jenkins-dist.sh
2023-02-17 15:06:15 -07:00
Darth Vader
59cf8dc779
Merge commit '5bef6c5841bbcf3276ad78f81c77673aa43e25b5'
2023-02-11 17:25:39 +00:00
Darth Vader
5bef6c5841
Squashed 'src/' changes from c32e6641..6e14dda9
...
6e14dda9 Merge commit 'a4eba15e3b254fa202a7ff58f9f474b1f2dbc584'
a4eba15e Squashed 'phreeqcpp/' changes from bbd2543..e9db33b
git-subtree-dir: src
git-subtree-split: 6e14dda95c0329d990f2f614c892709311b3be12
2023-02-11 17:25:38 +00:00
Charlton, Scott R
b67b914220
Merge pull request #17 from usgs-coupled/master
...
Sync develop with master
2023-01-29 19:19:57 -07:00
Charlton, Scott R
d942ba5211
Closes #14 and #15 ( #16 )
...
* Added sessionInfo() to R-CMD-check
* Set longer timeout for ctest
* Added cron schedule in order to store htmlhelp cache
2023-01-29 00:53:31 -07:00
Charlton, Scott R
78e93f68cb
[iphreeqc] updated .gitignore
2023-01-16 20:57:51 -07:00
Darth Vader
27d160eafc
Squashed 'src/' changes from 07fec0dd..c32e6641
...
c32e6641 Merge commit 'fb59ec8b19173e55422aef14fd2488cd1aca0680'
fb59ec8b Squashed 'phreeqcpp/' changes from feaa432..bbd2543
git-subtree-dir: src
git-subtree-split: c32e6641b2ffda0a8ea75f8b52327603923cf8b8
2023-01-17 03:32:45 +00:00
Darth Vader
5a49b4dbb5
Merge commit '27d160eafc07e0c195861725fc0534960ae7e871'
2023-01-17 03:32:45 +00:00
Darth Vader
ef0fddfc4a
Merge commit '0585087c9230a8e8e30c00f463c62dbf547717c5'
2023-01-17 03:31:27 +00:00
Darth Vader
0585087c92
Squashed 'phreeqc3-examples/' changes from b674cfe5..4fbe69b0
...
4fbe69b0 [phreeqc3] Updated to split numdiff from memcheck added additional labels based on mytest/Makefile sorted lists in CMakeLists.txt files numdiff tests use Release builds
git-subtree-dir: phreeqc3-examples
git-subtree-split: 4fbe69b0b5e2b1d809367769096a79bffd027d48
2023-01-17 03:31:26 +00:00
Darth Vader
a5c0125bc0
Squashed 'src/' changes from b32560ef..07fec0dd
...
07fec0dd Merge commit 'be9e230efb49f1bde06d9ca21a6a6042befc3c8e'
be9e230e Squashed 'phreeqcpp/' changes from 8715a91..feaa432
git-subtree-dir: src
git-subtree-split: 07fec0dda7375ac3e1c64cea372ebc7e7afe1013
2023-01-15 06:05:08 +00:00
Darth Vader
41bce1d8a2
Merge commit 'a5c0125bc0670499ea06a874ed96f2e6fc5b3c45'
2023-01-15 06:05:08 +00:00
Darth Vader
acc7b84f0b
Merge commit 'eab05a830c0d10ca0eed06b7e4b917986b7b5e93'
2023-01-15 06:02:08 +00:00
Darth Vader
eab05a830c
Squashed 'src/' changes from f676db22..b32560ef
...
b32560ef [iphreeqc] Issue 8 -- change sprintf to snprintf for CRAN (#9 )
git-subtree-dir: src
git-subtree-split: b32560efa0718ceb1afc7d5b2abf43011d0063c9
2023-01-15 06:02:07 +00:00
Darth Vader
c9fa1d4350
Squashed 'examples/c/' changes from 2a2707ae..11a83991
...
11a83991 [iphreeqc] Issue 8 -- change sprintf to snprintf for CRAN (#9 )
git-subtree-dir: examples/c
git-subtree-split: 11a83991492940a25d12e4ffe94623f2b6b05853
2023-01-15 06:02:06 +00:00
Darth Vader
6d94bbd95d
Merge commit 'c9fa1d4350076f923597317f8ee7d86ce8d17fec'
2023-01-15 06:02:06 +00:00
Charlton, Scott R
09619534e7
[iphreeqc] Issue 8 -- change sprintf to snprintf for CRAN ( #9 )
2023-01-14 22:14:20 -07:00
Charlton, Scott R
190336d03b
Turned off parallelization for ctest
2023-01-14 12:10:06 -07:00
Charlton, Scott R
8199a1e83d
Updated googletest to 1.12.1
2023-01-13 18:40:32 -07:00
Charlton, Scott R
af542f94e0
Added ctest
2023-01-13 17:06:36 -07:00
Charlton, Scott R
02f87fca34
Re-added chm & distcheck
2023-01-13 16:36:29 -07:00
Charlton, Scott R
3aa9295b39
matrix R-CMD-check
2023-01-13 15:04:56 -07:00
Charlton, Scott R
cc58bd1ae4
List files
2023-01-13 14:08:45 -07:00
Charlton, Scott R
29226a654b
Added check step
2023-01-13 13:43:10 -07:00
Charlton, Scott R
caea024766
Added pkgbuild dependency
2023-01-13 13:25:44 -07:00
Charlton, Scott R
b99c85e7bb
Updated date format for make source
2023-01-13 13:03:26 -07:00
Charlton, Scott R
842feb1938
Converted back to use outputs
2023-01-13 12:37:09 -07:00
Charlton, Scott R
2d878752df
Converted output to env
2023-01-13 12:13:42 -07:00
Charlton, Scott R
49d5fb6b00
Updated source target
...
reordered r-build steps
2023-01-13 11:46:06 -07:00
Charlton, Scott R
7421064ffd
fixed working directory
2023-01-13 11:14:57 -07:00
Charlton, Scott R
c986150d1f
Fixed working directory options
2023-01-13 11:04:12 -07:00
Charlton, Scott R
6e4c6e0f77
Added set working directory
2023-01-13 10:56:52 -07:00
Charlton, Scott R
ae1bd7fa4b
Fixed yml formatting
2023-01-13 10:47:30 -07:00
Charlton, Scott R
2119993bda
Working on R building
2023-01-13 10:41:19 -07:00
Charlton, Scott R
8ecb3cbc85
Added curl install
2023-01-12 20:50:01 -07:00
Charlton, Scott R
25d51d59e1
Updated to the latest actions
2023-01-12 20:08:05 -07:00
Charlton, Scott R
df7a58898e
Adding submission to cdash
2023-01-12 19:48:33 -07:00
Darth Vader
4eef971052
Merge commit '0fe41c1648e1a6801a86b5ae7501763c6d463ae8'
2023-01-09 01:56:16 +00:00
