Skip to content

Commit c8e935e

Browse files
github-actions[bot]github-actions[bot]
committed
Squashed 'IPhreeqcMMS/IPhreeqc/' changes from 6136c88a..b390c331
b390c331 Merge commit 'a78f34dc797a2b6c997ce986eab419c1a119a98b' a78f34dc Squashed 'src/' changes from 4457acc3..7835c6d5 721ac881 Merge commit '4d67ec082e78dcdbc4e02ae69a44084fe84bd9f2' 4d67ec08 Squashed 'src/' changes from 01d16cb2..4457acc3 a682be91 Merge commit '941a71640e5bb24981ff0ff225a542e46d7ebff5' 941a7164 Squashed 'src/' changes from cd19c4bb..01d16cb2 2fac1300 Merge commit '684223410a9be6ffdb3479c482e1d9a0f4a78823' 68422341 Squashed 'src/' changes from 767640fe..cd19c4bb 6a6e8c5d Remove unnecessary URL fields from subtrees.json files 846d30ae Squashed 'src/' changes from fc5d3678..767640fe bc05d0a0 Merge commit '846d30ae5211cbabde521d866a67454cd0fe48b0' 8f505c6f Squashed 'src/' changes from b33a48e2..fc5d3678 204b0e34 Merge commit '8f505c6f0035e9a9f2cbb5e575247a521025ab13' 59677a76 Merge commit '275553971d84e878866e8e326a6c3766a7e96aaa' 27555397 Squashed 'phreeqc3-examples/' changes from 1dbd65fc..6baa6075 854f17c2 Merge commit '0a5c6fc279b5f7ba17de9303bf5bbf21c7c56f79' 0a5c6fc2 Squashed 'phreeqc3-doc/' changes from 394240f2..05a4c62f af8fe101 Merge commit '7ad9ab5dc63ff6a4fa4400c19ac9ef8cdefed9c6' 7ad9ab5d Squashed 'database/' changes from dd98e151..5df53219 5e10caae Merge commit 'eead2b365915e5b65f4840e5f3fac5a0c4de749b' eead2b36 Squashed 'examples/fortran/' changes from 209412f4..5b829f90 75b4b5a3 Merge commit 'dc7a88c8c0b3206fe183e81736b77cbcfa7c8ec4' dc7a88c8 Squashed 'examples/com/' changes from a0ea2708..98de25e0 dd9748d1 Merge commit '12119014f706723cce192eee04b88f39c96686e7' 12119014 Squashed 'examples/c/' changes from 1680e5b7..371cbbd8 e2bd1717 Squashed 'src/' changes from b15a6bde..b33a48e2 6e1567d3 Merge commit 'e2bd17174b917c46184eaf107ea7add8f4b328e6' 4a0e162b Add workflows and configuration for syncing and linting subtrees git-subtree-dir: IPhreeqcMMS/IPhreeqc git-subtree-split: b390c3318dd9294f951ea81f054ab6ddce8a09fd
1 parent ddb1d47 commit c8e935e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+785
-0
lines changed

‎.github/subtrees.json‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
[
2+
{
3+
"prefix": "src",
4+
"repo": "usgs-coupled-subtrees/iphreeqc-src"
5+
},
6+
{
7+
"prefix": "examples/c",
8+
"repo": "usgs-coupled-subtrees/phreeqc-commanuscript-cgfinal-examples-c"
9+
},
10+
{
11+
"prefix": "examples/com",
12+
"repo": "usgs-coupled-subtrees/phreeqc-commanuscript-cgfinal-examples-com"
13+
},
14+
{
15+
"prefix": "examples/fortran",
16+
"repo": "usgs-coupled-subtrees/phreeqc-COMManuscript-CGfinal-examples-fortran"
17+
},
18+
{
19+
"prefix": "database",
20+
"repo": "usgs-coupled-subtrees/phreeqc3-database"
21+
},
22+
{
23+
"prefix": "phreeqc3-doc",
24+
"repo": "usgs-coupled-subtrees/phreeqc3-doc"
25+
},
26+
{
27+
"prefix": "phreeqc3-examples",
28+
"repo": "usgs-coupled-subtrees/phreeqc3-examples"
29+
}
30+
]

‎.github/workflows/lint-subtrees.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: Lint subtrees.json
2+
3+
on:
4+
pull_request:
5+
paths:
6+
- '.github/subtrees.json'
7+
workflow_call:
8+
workflow_dispatch:
9+
10+
jobs:
11+
lint-subtrees:
12+
runs-on: ubuntu-latest
13+
env:
14+
CI_SERVER_HOST: github.com
15+
GROUP: usgs-coupled
16+
steps:
17+
- uses: usgs-coupled-subtrees/sync-subtrees-action/lint-subtrees/@main
18+
with:
19+
ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}

‎.github/workflows/subtree.yml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Sync Subtrees
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
workflow_dispatch:
8+
inputs:
9+
dryRun:
10+
description: 'If true, don’t push any changes (for testing only).'
11+
required: true
12+
default: false
13+
type: boolean
14+
testMerge:
15+
description: 'Run in test mode, pushing to a test branch.'
16+
required: true
17+
default: false
18+
type: boolean
19+
20+
jobs:
21+
sync-subtrees:
22+
if: startsWith(github.repository, 'usgs-coupled-subtrees/')
23+
runs-on: ubuntu-latest
24+
env:
25+
CI_SERVER_HOST: github.com
26+
GROUP: usgs-coupled
27+
GH_TOKEN: ${{ secrets.WORKFLOW_PAT }}
28+
steps:
29+
- name: Run sync-subtrees-action
30+
uses: usgs-coupled-subtrees/sync-subtrees-action@main
31+
with:
32+
dryRun: ${{ inputs.dryRun }}
33+
testMerge: ${{ inputs.testMerge }}
34+
repository_name: ${{ github.event.repository.name }}
35+
default_branch: ${{ github.event.repository.default_branch }}
36+
run_number: ${{ github.run_number }}
37+
ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }}

‎database/.github/subtrees.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[]

‎database/.github/superprojects.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"usgs-coupled-subtrees/phreeqc3-database": {
3+
"superprojects": [
4+
"usgs-coupled-subtrees/iphreeqc",
5+
"usgs-coupled-subtrees/iphreeqccom",
6+
"usgs-coupled-subtrees/phreeqcrm",
7+
"usgs-coupled-subtrees/phreeqc3",
8+
"usgs-coupled-subtrees/wphast"
9+
]
10+
}
11+
}

‎database/.github/workflows/lint-subtrees.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: Lint subtrees.json
2+
3+
on:
4+
pull_request:
5+
paths:
6+
- '.github/subtrees.json'
7+
workflow_call:
8+
workflow_dispatch:
9+
10+
jobs:
11+
lint-subtrees:
12+
runs-on: ubuntu-latest
13+
env:
14+
CI_SERVER_HOST: github.com
15+
GROUP: usgs-coupled
16+
steps:
17+
- uses: usgs-coupled-subtrees/sync-subtrees-action/lint-subtrees/@main
18+
with:
19+
ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}

‎database/.github/workflows/lint-superprojects.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Lint superprojects.json
2+
3+
on:
4+
pull_request:
5+
paths:
6+
- '.github/superprojects.json'
7+
workflow_call:
8+
workflow_dispatch:
9+
10+
jobs:
11+
lint-superprojects:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: usgs-coupled-subtrees/sync-subtrees-action/lint-superprojects/@main
15+
with:
16+
ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
17+
# skip-repos: |
18+
# - usgs-coupled-subtrees/iphreeqccom
19+
# - usgs-coupled-subtrees/phreeqcrm-src
20+

‎database/.github/workflows/subtree.yml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Sync Subtrees
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
workflow_dispatch:
8+
inputs:
9+
dryRun:
10+
description: 'If true, don’t push any changes (for testing only).'
11+
required: true
12+
default: false
13+
type: boolean
14+
testMerge:
15+
description: 'Run in test mode, pushing to a test branch.'
16+
required: true
17+
default: false
18+
type: boolean
19+
20+
jobs:
21+
sync-subtrees:
22+
if: startsWith(github.repository, 'usgs-coupled-subtrees/')
23+
runs-on: ubuntu-latest
24+
env:
25+
CI_SERVER_HOST: github.com
26+
GROUP: usgs-coupled
27+
GH_TOKEN: ${{ secrets.WORKFLOW_PAT }}
28+
steps:
29+
- name: Run sync-subtrees-action
30+
uses: usgs-coupled-subtrees/sync-subtrees-action@main
31+
with:
32+
dryRun: ${{ inputs.dryRun }}
33+
testMerge: ${{ inputs.testMerge }}
34+
repository_name: ${{ github.event.repository.name }}
35+
default_branch: ${{ github.event.repository.default_branch }}
36+
run_number: ${{ github.run_number }}
37+
ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }}

‎examples/c/.github/subtrees.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[]

‎examples/c/.github/superprojects.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"usgs-coupled-subtrees/phreeqc-commanuscript-cgfinal-examples-c": {
3+
"superprojects": [
4+
"usgs-coupled-subtrees/iphreeqc",
5+
"usgs-coupled-subtrees/iphreeqccom",
6+
"usgs-coupled-subtrees/phreeqc"
7+
]
8+
}
9+
}

0 commit comments

Comments
 (0)