github-actions[bot]
74967e4a7b
Merge commit 'b6a59f94d9e2e7747fbea8c266fc9f5797e18c41'
2025-09-10 22:44:27 +00:00
github-actions[bot]
b6a59f94d9
Squashed 'database/' changes from 5df53219..b2736cd1
...
b2736cd1 Merge pull request #96 from dlparkhurst/mix_error
622420f1 Tony's fit of sulfate solubilities for phreeqc.dat, pitzer.dat, phreeqc_rates.dat
git-subtree-dir: database
git-subtree-split: b2736cd1fdff1a3a0665ef298045d7f3782aab9d
2025-09-10 22:44:27 +00:00
Charlton, Scott R.
901f8a23c3
Merge remote-tracking branch 'subtrees/master'
2025-08-19 15:31:42 -06:00
Charlton, Scott R.
8cb0264663
Merged git@github.com:usgs-coupled-subtrees/iphreeqc.git master using
...
git merge --strategy-option=theirs --squash subtrees/master
2025-08-19 12:18:26 -06:00
github-actions[bot]
b390c3318d
Merge commit 'a78f34dc797a2b6c997ce986eab419c1a119a98b'
2025-08-15 19:13:41 +00:00
github-actions[bot]
a78f34dc79
Squashed 'src/' changes from 4457acc3..7835c6d5
...
7835c6d5 Merge commit '8b244cf5d3f70a555ab60f2b0f282afd02a12c40'
8b244cf5 Squashed 'phreeqcpp/' changes from fadc352..83843db
git-subtree-dir: src
git-subtree-split: 7835c6d5f7d22dfb7689d09fc444020a68b9d63e
2025-08-15 19:13:41 +00:00
github-actions[bot]
721ac88190
Merge commit '4d67ec082e78dcdbc4e02ae69a44084fe84bd9f2'
2025-08-15 19:12:12 +00:00
github-actions[bot]
4d67ec082e
Squashed 'src/' changes from 01d16cb2..4457acc3
...
4457acc3 Refactor subtrees configuration by removing unnecessary URL fields and ensuring consistent formatting across all subtrees.json files.
git-subtree-dir: src
git-subtree-split: 4457acc3910528dd1e364c9a41f8e06cd1258c26
2025-08-15 19:12:11 +00:00
github-actions[bot]
a682be918f
Merge commit '941a71640e5bb24981ff0ff225a542e46d7ebff5'
2025-08-14 20:45:20 +00:00
github-actions[bot]
941a71640e
Squashed 'src/' changes from cd19c4bb..01d16cb2
...
01d16cb2 Merge commit 'f1f5186496f31d9907867eb50303b3fad63b6c42'
f1f51864 Squashed 'phreeqcpp/' changes from 0f2dfae..fadc352
git-subtree-dir: src
git-subtree-split: 01d16cb2cda77bebca683191f2db2a6a2d681f24
2025-08-14 20:45:19 +00:00
github-actions[bot]
2fac130043
Merge commit '684223410a9be6ffdb3479c482e1d9a0f4a78823'
2025-08-14 20:43:45 +00:00
github-actions[bot]
684223410a
Squashed 'src/' changes from 767640fe..cd19c4bb
...
cd19c4bb Remove unnecessary URL fields from subtrees.json files
git-subtree-dir: src
git-subtree-split: cd19c4bbf6788abf8a2a03edc5fad50a5c528d7f
2025-08-14 20:43:45 +00:00
Charlton, Scott R.
6a6e8c5d18
Remove unnecessary URL fields from subtrees.json files
2025-08-14 14:41:56 -06:00
github-actions[bot]
846d30ae52
Squashed 'src/' changes from fc5d3678..767640fe
...
767640fe Merge commit 'ee5a445a02e63b9973f1ebe9325556973033bb31'
ee5a445a Squashed 'phreeqcpp/' changes from b8182e5..0f2dfae
git-subtree-dir: src
git-subtree-split: 767640fe35eca288be7f6597e5e88cbbad9f600f
2025-08-14 00:09:12 +00:00
github-actions[bot]
bc05d0a090
Merge commit '846d30ae5211cbabde521d866a67454cd0fe48b0'
2025-08-14 00:09:12 +00:00
github-actions[bot]
8f505c6f00
Squashed 'src/' changes from b33a48e2..fc5d3678
...
fc5d3678 Merge commit 'cf140ebf070063962cfffd64b0b9cdb36f70995f'
cf140ebf Squashed 'phreeqcpp/' changes from 6991516..b8182e5
d69db23e Merge commit 'dd44fc2b0f3a6e6820b5f703741faa0a25b89530'
dd44fc2b Squashed 'phreeqcpp/' changes from b24dedb..6991516
git-subtree-dir: src
git-subtree-split: fc5d3678d9a257fb50c31b9507414db048cd7559
2025-08-06 22:49:50 +00:00
github-actions[bot]
204b0e3455
Merge commit '8f505c6f0035e9a9f2cbb5e575247a521025ab13'
2025-08-06 22:49:50 +00:00
github-actions[bot]
59677a76c2
Merge commit '275553971d84e878866e8e326a6c3766a7e96aaa'
2025-08-06 22:48:19 +00:00
github-actions[bot]
275553971d
Squashed 'phreeqc3-examples/' changes from 1dbd65fc..6baa6075
...
6baa6075 Add workflows and configuration for syncing and linting subtrees
git-subtree-dir: phreeqc3-examples
git-subtree-split: 6baa60752980bb9647c76f946256341b16fb9ca8
2025-08-06 22:48:19 +00:00
github-actions[bot]
854f17c298
Merge commit '0a5c6fc279b5f7ba17de9303bf5bbf21c7c56f79'
2025-08-06 22:48:18 +00:00
github-actions[bot]
0a5c6fc279
Squashed 'phreeqc3-doc/' changes from 394240f2..05a4c62f
...
05a4c62f Add workflows and configuration for syncing and linting subtrees
git-subtree-dir: phreeqc3-doc
git-subtree-split: 05a4c62f48558d3d9c4b3dccf6ea4f2bb1f3b8e2
2025-08-06 22:48:18 +00:00
github-actions[bot]
7ad9ab5dc6
Squashed 'database/' changes from dd98e151..5df53219
...
5df53219 Add workflows and configuration for syncing and linting subtrees
git-subtree-dir: database
git-subtree-split: 5df53219e1f6143cee10c67da88317f0dcd00c2b
2025-08-06 22:48:17 +00:00
github-actions[bot]
af8fe101e2
Merge commit '7ad9ab5dc63ff6a4fa4400c19ac9ef8cdefed9c6'
2025-08-06 22:48:17 +00:00
github-actions[bot]
5e10caae9d
Merge commit 'eead2b365915e5b65f4840e5f3fac5a0c4de749b'
2025-08-06 22:48:16 +00:00
github-actions[bot]
eead2b3659
Squashed 'examples/fortran/' changes from 209412f4..5b829f90
...
5b829f90 Add workflows and configuration for syncing and linting subtrees
git-subtree-dir: examples/fortran
git-subtree-split: 5b829f90667aefbe9eaaf9b1c97d7be7ddb87fa6
2025-08-06 22:48:16 +00:00
github-actions[bot]
75b4b5a33f
Merge commit 'dc7a88c8c0b3206fe183e81736b77cbcfa7c8ec4'
2025-08-06 22:48:15 +00:00
github-actions[bot]
dc7a88c8c0
Squashed 'examples/com/' changes from a0ea2708..98de25e0
...
98de25e0 Add workflows and configuration for syncing and linting subtrees
git-subtree-dir: examples/com
git-subtree-split: 98de25e096d6eb025f06a702576a562317aa6a6d
2025-08-06 22:48:15 +00:00
github-actions[bot]
dd9748d1b3
Merge commit '12119014f706723cce192eee04b88f39c96686e7'
2025-08-06 22:48:14 +00:00
github-actions[bot]
12119014f7
Squashed 'examples/c/' changes from 1680e5b7..371cbbd8
...
371cbbd8 Add workflows and configuration for syncing and linting subtrees
git-subtree-dir: examples/c
git-subtree-split: 371cbbd81ba4173cbe3c13d267fda1573be27425
2025-08-06 22:48:14 +00:00
github-actions[bot]
e2bd17174b
Squashed 'src/' changes from b15a6bde..b33a48e2
...
b33a48e2 Add workflows and configuration for syncing and linting subtrees
git-subtree-dir: src
git-subtree-split: b33a48e2bab452868b846a242ce3ac8ba7e4748f
2025-08-06 22:48:13 +00:00
github-actions[bot]
6e1567d3f9
Merge commit 'e2bd17174b917c46184eaf107ea7add8f4b328e6'
2025-08-06 22:48:13 +00:00
Charlton, Scott R.
4a0e162b91
Add workflows and configuration for syncing and linting subtrees
...
- Created .github/subtrees.json to define subtree repositories.
- Added linting workflow for subtrees.json in .github/workflows/lint-subtrees.yml.
- Implemented sync workflow for subtrees in .github/workflows/subtree.yml.
- Created subtrees.json and superprojects.json files in database, examples/c, examples/com, and examples/fortran directories.
- Added linting workflows for subtrees.json and superprojects.json in respective directories.
- Established sync workflows for subtrees in examples/c, examples/com, examples/fortran, and src directories.
- Configured subtrees.json and superprojects.json for src and src/phreeqcpp directories.
- Implemented linting workflows for subtrees.json and superprojects.json in src and src/phreeqcpp directories.
- Added common superprojects.json in src/phreeqcpp/common directory.
2025-08-06 16:46:25 -06:00
github-actions[bot]
4b6ccf92ee
Merge commit '1dbd65fc74fc452b40d37030c51cff2f9bccf894'
2025-07-06 19:33:43 +00:00
github-actions[bot]
024ae099dc
Merge commit '394240f20af07dabe460ea1f6ce11016f7427362'
2025-07-06 19:33:40 +00:00
github-actions[bot]
dbc2e0c148
Merge commit 'dd98e151672348f240062be7fe72242e86226696'
2025-07-06 19:33:37 +00:00
github-actions[bot]
fccff09dc7
Merge commit '209412f4d9d11bfeb15d74cbf7372ea6787a49cd'
2025-07-06 19:33:33 +00:00
github-actions[bot]
0722d127ad
Merge commit 'f9d9549bf30116e33f20721af068979ec4ca5d6d'
2025-07-06 19:33:30 +00:00
github-actions[bot]
83183aa1b1
Merge commit 'be121f9d8a5f3eef3195eff02c90c2dcdbb7cf9c'
2025-07-06 19:33:27 +00:00
github-actions[bot]
9a4186b178
Merge commit 'c3280180d4e23deabfa427fe80b3a89d0d9d4d5f'
2025-07-06 19:33:24 +00:00
github-actions[bot]
00cf2328a8
Merge commit 'c3b41a797af2b4e38b6fee6b68480d762dcf1311'
2025-07-06 19:24:13 +00:00
github-actions[bot]
c3b41a797a
Squashed 'examples/c/' changes from 1680e5b7..be121f9d
...
be121f9d Add workflows for linting and syncing subtrees, and update subtrees.json format
git-subtree-dir: examples/c
git-subtree-split: be121f9d8a5f3eef3195eff02c90c2dcdbb7cf9c
2025-07-06 19:24:13 +00:00
github-actions[bot]
cc90e24b2b
Merge commit '7ab2a246ea7474f8e386af8efb675ab02642857f'
2025-07-06 19:24:12 +00:00
github-actions[bot]
7ab2a246ea
Squashed 'src/' changes from 06302c77..79654e62
...
79654e62 Add workflows for linting and syncing subtrees, and update subtrees.json format
git-subtree-dir: src
git-subtree-split: 79654e62f12543065b480f127e77de58d335d1e0
2025-07-06 19:24:12 +00:00
Charlton, Scott R
c3280180d4
Add missing comma and ensure repo field is included in subtrees.json
2025-07-06 13:23:29 -06:00
Charlton, Scott R.
afefbbcf95
Add missing comma and ensure repo field is included in subtrees.json
2025-07-06 13:23:29 -06:00
Charlton, Scott R
be121f9d8a
Add workflows for linting and syncing subtrees, and update subtrees.json format
2025-07-06 13:08:57 -06:00
Charlton, Scott R
79654e62f1
Add workflows for linting and syncing subtrees, and update subtrees.json format
2025-07-06 13:08:57 -06:00
Charlton, Scott R.
22eab2be4d
Add workflows for linting and syncing subtrees, and update subtrees.json format
2025-07-06 13:08:57 -06:00
Charlton, Scott R.
7ac0cb0f25
Update GH_TOKEN to use secrets for enhanced security in sync-subtrees job
2025-07-05 16:31:12 -06:00
Charlton, Scott R.
4460ae04d3
Add GH_TOKEN environment variable to sync-subtrees job
2025-07-04 11:35:28 -06:00
