mirror of
https://git.gfz-potsdam.de/naaice/iphreeqc.git
synced 2025-12-15 16:18:22 +01:00
Merged git@github.com:usgs-coupled-subtrees/iphreeqc.git master using
git merge --strategy-option=theirs --squash subtrees/master
This commit is contained in:
parent
4b6ccf92ee
commit
8cb0264663
7
.github/subtrees.json
vendored
7
.github/subtrees.json
vendored
@ -1,37 +1,30 @@
|
|||||||
[
|
[
|
||||||
{
|
{
|
||||||
"prefix": "src",
|
"prefix": "src",
|
||||||
"url": "git@${CI_SERVER_HOST}:${GROUP}-subtrees/iphreeqc-src.git",
|
|
||||||
"repo": "usgs-coupled-subtrees/iphreeqc-src"
|
"repo": "usgs-coupled-subtrees/iphreeqc-src"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"prefix": "examples/c",
|
"prefix": "examples/c",
|
||||||
"url": "git@${CI_SERVER_HOST}:${GROUP}-subtrees/phreeqc-commanuscript-cgfinal-examples-c.git",
|
|
||||||
"repo": "usgs-coupled-subtrees/phreeqc-commanuscript-cgfinal-examples-c"
|
"repo": "usgs-coupled-subtrees/phreeqc-commanuscript-cgfinal-examples-c"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"prefix": "examples/com",
|
"prefix": "examples/com",
|
||||||
"url": "git@${CI_SERVER_HOST}:${GROUP}-subtrees/phreeqc-commanuscript-cgfinal-examples-com.git",
|
|
||||||
"repo": "usgs-coupled-subtrees/phreeqc-commanuscript-cgfinal-examples-com"
|
"repo": "usgs-coupled-subtrees/phreeqc-commanuscript-cgfinal-examples-com"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"prefix": "examples/fortran",
|
"prefix": "examples/fortran",
|
||||||
"url": "git@${CI_SERVER_HOST}:${GROUP}-subtrees/phreeqc-COMManuscript-CGfinal-examples-fortran.git",
|
|
||||||
"repo": "usgs-coupled-subtrees/phreeqc-COMManuscript-CGfinal-examples-fortran"
|
"repo": "usgs-coupled-subtrees/phreeqc-COMManuscript-CGfinal-examples-fortran"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"prefix": "database",
|
"prefix": "database",
|
||||||
"url": "git@${CI_SERVER_HOST}:${GROUP}-subtrees/phreeqc3-database.git",
|
|
||||||
"repo": "usgs-coupled-subtrees/phreeqc3-database"
|
"repo": "usgs-coupled-subtrees/phreeqc3-database"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"prefix": "phreeqc3-doc",
|
"prefix": "phreeqc3-doc",
|
||||||
"url": "git@${CI_SERVER_HOST}:${GROUP}-subtrees/phreeqc3-doc.git",
|
|
||||||
"repo": "usgs-coupled-subtrees/phreeqc3-doc"
|
"repo": "usgs-coupled-subtrees/phreeqc3-doc"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"prefix": "phreeqc3-examples",
|
"prefix": "phreeqc3-examples",
|
||||||
"url": "git@${CI_SERVER_HOST}:${GROUP}-subtrees/phreeqc3-examples.git",
|
|
||||||
"repo": "usgs-coupled-subtrees/phreeqc3-examples"
|
"repo": "usgs-coupled-subtrees/phreeqc3-examples"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
2
.github/workflows/lint-subtrees.yml
vendored
2
.github/workflows/lint-subtrees.yml
vendored
@ -14,6 +14,6 @@ jobs:
|
|||||||
CI_SERVER_HOST: github.com
|
CI_SERVER_HOST: github.com
|
||||||
GROUP: usgs-coupled
|
GROUP: usgs-coupled
|
||||||
steps:
|
steps:
|
||||||
- uses: usgs-coupled/sync-subtrees-action/lint-subtrees/@main
|
- uses: usgs-coupled-subtrees/sync-subtrees-action/lint-subtrees/@main
|
||||||
with:
|
with:
|
||||||
ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
|
ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
|
||||||
|
|||||||
8
.github/workflows/subtree.yml
vendored
8
.github/workflows/subtree.yml
vendored
@ -1,12 +1,15 @@
|
|||||||
name: Sync Subtrees
|
name: Sync Subtrees
|
||||||
|
|
||||||
on:
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- master
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
inputs:
|
inputs:
|
||||||
dryRun:
|
dryRun:
|
||||||
description: 'If true, don’t push any changes (for testing only).'
|
description: 'If true, don’t push any changes (for testing only).'
|
||||||
required: true
|
required: true
|
||||||
default: true
|
default: false
|
||||||
type: boolean
|
type: boolean
|
||||||
testMerge:
|
testMerge:
|
||||||
description: 'Run in test mode, pushing to a test branch.'
|
description: 'Run in test mode, pushing to a test branch.'
|
||||||
@ -16,6 +19,7 @@ on:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
sync-subtrees:
|
sync-subtrees:
|
||||||
|
if: startsWith(github.repository, 'usgs-coupled-subtrees/')
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
env:
|
env:
|
||||||
CI_SERVER_HOST: github.com
|
CI_SERVER_HOST: github.com
|
||||||
@ -23,7 +27,7 @@ jobs:
|
|||||||
GH_TOKEN: ${{ secrets.WORKFLOW_PAT }}
|
GH_TOKEN: ${{ secrets.WORKFLOW_PAT }}
|
||||||
steps:
|
steps:
|
||||||
- name: Run sync-subtrees-action
|
- name: Run sync-subtrees-action
|
||||||
uses: usgs-coupled/sync-subtrees-action@main
|
uses: usgs-coupled-subtrees/sync-subtrees-action@main
|
||||||
with:
|
with:
|
||||||
dryRun: ${{ inputs.dryRun }}
|
dryRun: ${{ inputs.dryRun }}
|
||||||
testMerge: ${{ inputs.testMerge }}
|
testMerge: ${{ inputs.testMerge }}
|
||||||
|
|||||||
1
database/.github/subtrees.json
vendored
Normal file
1
database/.github/subtrees.json
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
[]
|
||||||
11
database/.github/superprojects.json
vendored
Normal file
11
database/.github/superprojects.json
vendored
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
{
|
||||||
|
"usgs-coupled-subtrees/phreeqc3-database": {
|
||||||
|
"superprojects": [
|
||||||
|
"usgs-coupled-subtrees/iphreeqc",
|
||||||
|
"usgs-coupled-subtrees/iphreeqccom",
|
||||||
|
"usgs-coupled-subtrees/phreeqcrm",
|
||||||
|
"usgs-coupled-subtrees/phreeqc3",
|
||||||
|
"usgs-coupled-subtrees/wphast"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
19
database/.github/workflows/lint-subtrees.yml
vendored
Normal file
19
database/.github/workflows/lint-subtrees.yml
vendored
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
name: Lint subtrees.json
|
||||||
|
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
paths:
|
||||||
|
- '.github/subtrees.json'
|
||||||
|
workflow_call:
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
lint-subtrees:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
env:
|
||||||
|
CI_SERVER_HOST: github.com
|
||||||
|
GROUP: usgs-coupled
|
||||||
|
steps:
|
||||||
|
- uses: usgs-coupled-subtrees/sync-subtrees-action/lint-subtrees/@main
|
||||||
|
with:
|
||||||
|
ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
|
||||||
20
database/.github/workflows/lint-superprojects.yml
vendored
Normal file
20
database/.github/workflows/lint-superprojects.yml
vendored
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
name: Lint superprojects.json
|
||||||
|
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
paths:
|
||||||
|
- '.github/superprojects.json'
|
||||||
|
workflow_call:
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
lint-superprojects:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: usgs-coupled-subtrees/sync-subtrees-action/lint-superprojects/@main
|
||||||
|
with:
|
||||||
|
ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
|
||||||
|
# skip-repos: |
|
||||||
|
# - usgs-coupled-subtrees/iphreeqccom
|
||||||
|
# - usgs-coupled-subtrees/phreeqcrm-src
|
||||||
|
|
||||||
37
database/.github/workflows/subtree.yml
vendored
Normal file
37
database/.github/workflows/subtree.yml
vendored
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
name: Sync Subtrees
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- master
|
||||||
|
workflow_dispatch:
|
||||||
|
inputs:
|
||||||
|
dryRun:
|
||||||
|
description: 'If true, don’t push any changes (for testing only).'
|
||||||
|
required: true
|
||||||
|
default: false
|
||||||
|
type: boolean
|
||||||
|
testMerge:
|
||||||
|
description: 'Run in test mode, pushing to a test branch.'
|
||||||
|
required: true
|
||||||
|
default: false
|
||||||
|
type: boolean
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
sync-subtrees:
|
||||||
|
if: startsWith(github.repository, 'usgs-coupled-subtrees/')
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
env:
|
||||||
|
CI_SERVER_HOST: github.com
|
||||||
|
GROUP: usgs-coupled
|
||||||
|
GH_TOKEN: ${{ secrets.WORKFLOW_PAT }}
|
||||||
|
steps:
|
||||||
|
- name: Run sync-subtrees-action
|
||||||
|
uses: usgs-coupled-subtrees/sync-subtrees-action@main
|
||||||
|
with:
|
||||||
|
dryRun: ${{ inputs.dryRun }}
|
||||||
|
testMerge: ${{ inputs.testMerge }}
|
||||||
|
repository_name: ${{ github.event.repository.name }}
|
||||||
|
default_branch: ${{ github.event.repository.default_branch }}
|
||||||
|
run_number: ${{ github.run_number }}
|
||||||
|
ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }}
|
||||||
9
examples/c/.github/superprojects.json
vendored
Normal file
9
examples/c/.github/superprojects.json
vendored
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
{
|
||||||
|
"usgs-coupled-subtrees/phreeqc-commanuscript-cgfinal-examples-c": {
|
||||||
|
"superprojects": [
|
||||||
|
"usgs-coupled-subtrees/iphreeqc",
|
||||||
|
"usgs-coupled-subtrees/iphreeqccom",
|
||||||
|
"usgs-coupled-subtrees/phreeqc"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -14,6 +14,6 @@ jobs:
|
|||||||
CI_SERVER_HOST: github.com
|
CI_SERVER_HOST: github.com
|
||||||
GROUP: usgs-coupled
|
GROUP: usgs-coupled
|
||||||
steps:
|
steps:
|
||||||
- uses: usgs-coupled/sync-subtrees-action/lint-subtrees/@main
|
- uses: usgs-coupled-subtrees/sync-subtrees-action/lint-subtrees/@main
|
||||||
with:
|
with:
|
||||||
ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
|
ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
|
||||||
|
|||||||
16
examples/c/.github/workflows/lint-superprojects.yml
vendored
Normal file
16
examples/c/.github/workflows/lint-superprojects.yml
vendored
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
name: Lint superprojects.json
|
||||||
|
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
paths:
|
||||||
|
- '.github/superprojects.json'
|
||||||
|
workflow_call:
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
lint-superprojects:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: usgs-coupled-subtrees/sync-subtrees-action/lint-superprojects/@main
|
||||||
|
with:
|
||||||
|
ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
|
||||||
8
examples/c/.github/workflows/subtree.yml
vendored
8
examples/c/.github/workflows/subtree.yml
vendored
@ -1,12 +1,15 @@
|
|||||||
name: Sync Subtrees
|
name: Sync Subtrees
|
||||||
|
|
||||||
on:
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- master
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
inputs:
|
inputs:
|
||||||
dryRun:
|
dryRun:
|
||||||
description: 'If true, don’t push any changes (for testing only).'
|
description: 'If true, don’t push any changes (for testing only).'
|
||||||
required: true
|
required: true
|
||||||
default: true
|
default: false
|
||||||
type: boolean
|
type: boolean
|
||||||
testMerge:
|
testMerge:
|
||||||
description: 'Run in test mode, pushing to a test branch.'
|
description: 'Run in test mode, pushing to a test branch.'
|
||||||
@ -16,6 +19,7 @@ on:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
sync-subtrees:
|
sync-subtrees:
|
||||||
|
if: startsWith(github.repository, 'usgs-coupled-subtrees/')
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
env:
|
env:
|
||||||
CI_SERVER_HOST: github.com
|
CI_SERVER_HOST: github.com
|
||||||
@ -23,7 +27,7 @@ jobs:
|
|||||||
GH_TOKEN: ${{ secrets.WORKFLOW_PAT }}
|
GH_TOKEN: ${{ secrets.WORKFLOW_PAT }}
|
||||||
steps:
|
steps:
|
||||||
- name: Run sync-subtrees-action
|
- name: Run sync-subtrees-action
|
||||||
uses: usgs-coupled/sync-subtrees-action@main
|
uses: usgs-coupled-subtrees/sync-subtrees-action@main
|
||||||
with:
|
with:
|
||||||
dryRun: ${{ inputs.dryRun }}
|
dryRun: ${{ inputs.dryRun }}
|
||||||
testMerge: ${{ inputs.testMerge }}
|
testMerge: ${{ inputs.testMerge }}
|
||||||
|
|||||||
1
examples/com/.github/subtrees.json
vendored
Normal file
1
examples/com/.github/subtrees.json
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
[]
|
||||||
9
examples/com/.github/superprojects.json
vendored
Normal file
9
examples/com/.github/superprojects.json
vendored
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
{
|
||||||
|
"usgs-coupled-subtrees/phreeqc-commanuscript-cgfinal-examples-com": {
|
||||||
|
"superprojects": [
|
||||||
|
"usgs-coupled-subtrees/iphreeqc",
|
||||||
|
"usgs-coupled-subtrees/iphreeqccom",
|
||||||
|
"usgs-coupled-subtrees/phreeqc"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
19
examples/com/.github/workflows/lint-subtrees.yml
vendored
Normal file
19
examples/com/.github/workflows/lint-subtrees.yml
vendored
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
name: Lint subtrees.json
|
||||||
|
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
paths:
|
||||||
|
- '.github/subtrees.json'
|
||||||
|
workflow_call:
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
lint-subtrees:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
env:
|
||||||
|
CI_SERVER_HOST: github.com
|
||||||
|
GROUP: usgs-coupled
|
||||||
|
steps:
|
||||||
|
- uses: usgs-coupled-subtrees/sync-subtrees-action/lint-subtrees/@main
|
||||||
|
with:
|
||||||
|
ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
|
||||||
16
examples/com/.github/workflows/lint-superprojects.yml
vendored
Normal file
16
examples/com/.github/workflows/lint-superprojects.yml
vendored
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
name: Lint superprojects.json
|
||||||
|
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
paths:
|
||||||
|
- '.github/superprojects.json'
|
||||||
|
workflow_call:
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
lint-superprojects:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: usgs-coupled-subtrees/sync-subtrees-action/lint-superprojects/@main
|
||||||
|
with:
|
||||||
|
ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
|
||||||
37
examples/com/.github/workflows/subtree.yml
vendored
Normal file
37
examples/com/.github/workflows/subtree.yml
vendored
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
name: Sync Subtrees
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- master
|
||||||
|
workflow_dispatch:
|
||||||
|
inputs:
|
||||||
|
dryRun:
|
||||||
|
description: 'If true, don’t push any changes (for testing only).'
|
||||||
|
required: true
|
||||||
|
default: false
|
||||||
|
type: boolean
|
||||||
|
testMerge:
|
||||||
|
description: 'Run in test mode, pushing to a test branch.'
|
||||||
|
required: true
|
||||||
|
default: false
|
||||||
|
type: boolean
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
sync-subtrees:
|
||||||
|
if: startsWith(github.repository, 'usgs-coupled-subtrees/')
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
env:
|
||||||
|
CI_SERVER_HOST: github.com
|
||||||
|
GROUP: usgs-coupled
|
||||||
|
GH_TOKEN: ${{ secrets.WORKFLOW_PAT }}
|
||||||
|
steps:
|
||||||
|
- name: Run sync-subtrees-action
|
||||||
|
uses: usgs-coupled-subtrees/sync-subtrees-action@main
|
||||||
|
with:
|
||||||
|
dryRun: ${{ inputs.dryRun }}
|
||||||
|
testMerge: ${{ inputs.testMerge }}
|
||||||
|
repository_name: ${{ github.event.repository.name }}
|
||||||
|
default_branch: ${{ github.event.repository.default_branch }}
|
||||||
|
run_number: ${{ github.run_number }}
|
||||||
|
ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }}
|
||||||
1
examples/fortran/.github/subtrees.json
vendored
Normal file
1
examples/fortran/.github/subtrees.json
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
[]
|
||||||
9
examples/fortran/.github/superprojects.json
vendored
Normal file
9
examples/fortran/.github/superprojects.json
vendored
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
{
|
||||||
|
"usgs-coupled-subtrees/phreeqc-COMManuscript-CGfinal-examples-fortran": {
|
||||||
|
"superprojects": [
|
||||||
|
"usgs-coupled-subtrees/iphreeqc",
|
||||||
|
"usgs-coupled-subtrees/iphreeqccom",
|
||||||
|
"usgs-coupled-subtrees/phreeqc"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
19
examples/fortran/.github/workflows/lint-subtrees.yml
vendored
Normal file
19
examples/fortran/.github/workflows/lint-subtrees.yml
vendored
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
name: Lint subtrees.json
|
||||||
|
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
paths:
|
||||||
|
- '.github/subtrees.json'
|
||||||
|
workflow_call:
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
lint-subtrees:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
env:
|
||||||
|
CI_SERVER_HOST: github.com
|
||||||
|
GROUP: usgs-coupled
|
||||||
|
steps:
|
||||||
|
- uses: usgs-coupled-subtrees/sync-subtrees-action/lint-subtrees/@main
|
||||||
|
with:
|
||||||
|
ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
|
||||||
16
examples/fortran/.github/workflows/lint-superprojects.yml
vendored
Normal file
16
examples/fortran/.github/workflows/lint-superprojects.yml
vendored
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
name: Lint superprojects.json
|
||||||
|
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
paths:
|
||||||
|
- '.github/superprojects.json'
|
||||||
|
workflow_call:
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
lint-superprojects:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: usgs-coupled-subtrees/sync-subtrees-action/lint-superprojects/@main
|
||||||
|
with:
|
||||||
|
ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
|
||||||
37
examples/fortran/.github/workflows/subtree.yml
vendored
Normal file
37
examples/fortran/.github/workflows/subtree.yml
vendored
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
name: Sync Subtrees
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- master
|
||||||
|
workflow_dispatch:
|
||||||
|
inputs:
|
||||||
|
dryRun:
|
||||||
|
description: 'If true, don’t push any changes (for testing only).'
|
||||||
|
required: true
|
||||||
|
default: false
|
||||||
|
type: boolean
|
||||||
|
testMerge:
|
||||||
|
description: 'Run in test mode, pushing to a test branch.'
|
||||||
|
required: true
|
||||||
|
default: false
|
||||||
|
type: boolean
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
sync-subtrees:
|
||||||
|
if: startsWith(github.repository, 'usgs-coupled-subtrees/')
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
env:
|
||||||
|
CI_SERVER_HOST: github.com
|
||||||
|
GROUP: usgs-coupled
|
||||||
|
GH_TOKEN: ${{ secrets.WORKFLOW_PAT }}
|
||||||
|
steps:
|
||||||
|
- name: Run sync-subtrees-action
|
||||||
|
uses: usgs-coupled-subtrees/sync-subtrees-action@main
|
||||||
|
with:
|
||||||
|
dryRun: ${{ inputs.dryRun }}
|
||||||
|
testMerge: ${{ inputs.testMerge }}
|
||||||
|
repository_name: ${{ github.event.repository.name }}
|
||||||
|
default_branch: ${{ github.event.repository.default_branch }}
|
||||||
|
run_number: ${{ github.run_number }}
|
||||||
|
ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }}
|
||||||
1
phreeqc3-doc/.github/subtrees.json
vendored
Normal file
1
phreeqc3-doc/.github/subtrees.json
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
[]
|
||||||
10
phreeqc3-doc/.github/superprojects.json
vendored
Normal file
10
phreeqc3-doc/.github/superprojects.json
vendored
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
{
|
||||||
|
"usgs-coupled-subtrees/phreeqc3-doc": {
|
||||||
|
"superprojects": [
|
||||||
|
"usgs-coupled-subtrees/iphreeqc",
|
||||||
|
"usgs-coupled-subtrees/iphreeqccom",
|
||||||
|
"usgs-coupled-subtrees/phast3-doc",
|
||||||
|
"usgs-coupled-subtrees/phreeqc3"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
19
phreeqc3-doc/.github/workflows/lint-subtrees.yml
vendored
Normal file
19
phreeqc3-doc/.github/workflows/lint-subtrees.yml
vendored
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
name: Lint subtrees.json
|
||||||
|
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
paths:
|
||||||
|
- '.github/subtrees.json'
|
||||||
|
workflow_call:
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
lint-subtrees:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
env:
|
||||||
|
CI_SERVER_HOST: github.com
|
||||||
|
GROUP: usgs-coupled
|
||||||
|
steps:
|
||||||
|
- uses: usgs-coupled-subtrees/sync-subtrees-action/lint-subtrees/@main
|
||||||
|
with:
|
||||||
|
ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
|
||||||
16
phreeqc3-doc/.github/workflows/lint-superprojects.yml
vendored
Normal file
16
phreeqc3-doc/.github/workflows/lint-superprojects.yml
vendored
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
name: Lint superprojects.json
|
||||||
|
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
paths:
|
||||||
|
- '.github/superprojects.json'
|
||||||
|
workflow_call:
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
lint-superprojects:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: usgs-coupled-subtrees/sync-subtrees-action/lint-superprojects/@main
|
||||||
|
with:
|
||||||
|
ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
|
||||||
37
phreeqc3-doc/.github/workflows/subtree.yml
vendored
Normal file
37
phreeqc3-doc/.github/workflows/subtree.yml
vendored
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
name: Sync Subtrees
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- master
|
||||||
|
workflow_dispatch:
|
||||||
|
inputs:
|
||||||
|
dryRun:
|
||||||
|
description: 'If true, don’t push any changes (for testing only).'
|
||||||
|
required: true
|
||||||
|
default: false
|
||||||
|
type: boolean
|
||||||
|
testMerge:
|
||||||
|
description: 'Run in test mode, pushing to a test branch.'
|
||||||
|
required: true
|
||||||
|
default: false
|
||||||
|
type: boolean
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
sync-subtrees:
|
||||||
|
if: startsWith(github.repository, 'usgs-coupled-subtrees/')
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
env:
|
||||||
|
CI_SERVER_HOST: github.com
|
||||||
|
GROUP: usgs-coupled
|
||||||
|
GH_TOKEN: ${{ secrets.WORKFLOW_PAT }}
|
||||||
|
steps:
|
||||||
|
- name: Run sync-subtrees-action
|
||||||
|
uses: usgs-coupled-subtrees/sync-subtrees-action@main
|
||||||
|
with:
|
||||||
|
dryRun: ${{ inputs.dryRun }}
|
||||||
|
testMerge: ${{ inputs.testMerge }}
|
||||||
|
repository_name: ${{ github.event.repository.name }}
|
||||||
|
default_branch: ${{ github.event.repository.default_branch }}
|
||||||
|
run_number: ${{ github.run_number }}
|
||||||
|
ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }}
|
||||||
1
phreeqc3-examples/.github/subtrees.json
vendored
Normal file
1
phreeqc3-examples/.github/subtrees.json
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
[]
|
||||||
19
phreeqc3-examples/.github/workflows/lint-subtrees.yml
vendored
Normal file
19
phreeqc3-examples/.github/workflows/lint-subtrees.yml
vendored
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
name: Lint subtrees.json
|
||||||
|
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
paths:
|
||||||
|
- '.github/subtrees.json'
|
||||||
|
workflow_call:
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
lint-subtrees:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
env:
|
||||||
|
CI_SERVER_HOST: github.com
|
||||||
|
GROUP: usgs-coupled
|
||||||
|
steps:
|
||||||
|
- uses: usgs-coupled-subtrees/sync-subtrees-action/lint-subtrees/@main
|
||||||
|
with:
|
||||||
|
ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
|
||||||
37
phreeqc3-examples/.github/workflows/subtree.yml
vendored
Normal file
37
phreeqc3-examples/.github/workflows/subtree.yml
vendored
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
name: Sync Subtrees
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- master
|
||||||
|
workflow_dispatch:
|
||||||
|
inputs:
|
||||||
|
dryRun:
|
||||||
|
description: 'If true, don’t push any changes (for testing only).'
|
||||||
|
required: true
|
||||||
|
default: false
|
||||||
|
type: boolean
|
||||||
|
testMerge:
|
||||||
|
description: 'Run in test mode, pushing to a test branch.'
|
||||||
|
required: true
|
||||||
|
default: false
|
||||||
|
type: boolean
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
sync-subtrees:
|
||||||
|
if: startsWith(github.repository, 'usgs-coupled-subtrees/')
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
env:
|
||||||
|
CI_SERVER_HOST: github.com
|
||||||
|
GROUP: usgs-coupled
|
||||||
|
GH_TOKEN: ${{ secrets.WORKFLOW_PAT }}
|
||||||
|
steps:
|
||||||
|
- name: Run sync-subtrees-action
|
||||||
|
uses: usgs-coupled-subtrees/sync-subtrees-action@main
|
||||||
|
with:
|
||||||
|
dryRun: ${{ inputs.dryRun }}
|
||||||
|
testMerge: ${{ inputs.testMerge }}
|
||||||
|
repository_name: ${{ github.event.repository.name }}
|
||||||
|
default_branch: ${{ github.event.repository.default_branch }}
|
||||||
|
run_number: ${{ github.run_number }}
|
||||||
|
ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }}
|
||||||
3
src/.github/subtrees.json
vendored
3
src/.github/subtrees.json
vendored
@ -1,7 +1,6 @@
|
|||||||
[
|
[
|
||||||
{
|
{
|
||||||
"prefix": "phreeqcpp",
|
"prefix": "phreeqcpp",
|
||||||
"url": "git@${CI_SERVER_HOST}:${GROUP}-subtrees/phreeqc3-src.git",
|
|
||||||
"repo": "usgs-coupled-subtrees/phreeqc3-src"
|
"repo": "usgs-coupled-subtrees/phreeqc3-src"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|||||||
6
src/.github/superprojects.json
vendored
6
src/.github/superprojects.json
vendored
@ -1,8 +1,8 @@
|
|||||||
{
|
{
|
||||||
"iphreeqc-src": {
|
"usgs-coupled-subtrees/iphreeqc-src": {
|
||||||
"superprojects": [
|
"superprojects": [
|
||||||
"usgs-coupled/iphreeqc",
|
"usgs-coupled-subtrees/iphreeqc",
|
||||||
"usgs-coupled/iphreeqccom",
|
"usgs-coupled-subtrees/iphreeqccom",
|
||||||
"usgs-coupled-subtrees/phreeqcrm-src"
|
"usgs-coupled-subtrees/phreeqcrm-src"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
2
src/.github/workflows/lint-subtrees.yml
vendored
2
src/.github/workflows/lint-subtrees.yml
vendored
@ -17,6 +17,6 @@ jobs:
|
|||||||
CI_SERVER_HOST: github.com
|
CI_SERVER_HOST: github.com
|
||||||
GROUP: usgs-coupled
|
GROUP: usgs-coupled
|
||||||
steps:
|
steps:
|
||||||
- uses: usgs-coupled/sync-subtrees-action/lint-subtrees/@main
|
- uses: usgs-coupled-subtrees/sync-subtrees-action/lint-subtrees/@main
|
||||||
with:
|
with:
|
||||||
ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
|
ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
|
||||||
|
|||||||
2
src/.github/workflows/lint-superprojects.yml
vendored
2
src/.github/workflows/lint-superprojects.yml
vendored
@ -11,6 +11,6 @@ jobs:
|
|||||||
lint-superprojects:
|
lint-superprojects:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: usgs-coupled/sync-subtrees-action/lint-superprojects/@main
|
- uses: usgs-coupled-subtrees/sync-subtrees-action/lint-superprojects/@main
|
||||||
with:
|
with:
|
||||||
ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
|
ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
|
||||||
|
|||||||
11
src/.github/workflows/subtree.yml
vendored
11
src/.github/workflows/subtree.yml
vendored
@ -1,12 +1,15 @@
|
|||||||
name: Sync Subtrees
|
name: Sync Subtrees
|
||||||
|
|
||||||
on:
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- master
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
inputs:
|
inputs:
|
||||||
dryRun:
|
dryRun:
|
||||||
description: 'If true, don’t push any changes (for testing only).'
|
description: 'If true, don’t push any changes (for testing only).'
|
||||||
required: true
|
required: true
|
||||||
default: true
|
default: false
|
||||||
type: boolean
|
type: boolean
|
||||||
testMerge:
|
testMerge:
|
||||||
description: 'Run in test mode, pushing to a test branch.'
|
description: 'Run in test mode, pushing to a test branch.'
|
||||||
@ -16,13 +19,15 @@ on:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
sync-subtrees:
|
sync-subtrees:
|
||||||
|
if: startsWith(github.repository, 'usgs-coupled-subtrees/')
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
env:
|
env:
|
||||||
CI_SERVER_HOST: github.com
|
CI_SERVER_HOST: github.com
|
||||||
GROUP: usgs-coupled
|
GROUP: usgs-coupled
|
||||||
|
GH_TOKEN: ${{ secrets.WORKFLOW_PAT }}
|
||||||
steps:
|
steps:
|
||||||
- name: Run sync-subtrees-action
|
- name: Run sync-subtrees-action
|
||||||
uses: usgs-coupled/sync-subtrees-action@main
|
uses: usgs-coupled-subtrees/sync-subtrees-action@main
|
||||||
with:
|
with:
|
||||||
dryRun: ${{ inputs.dryRun }}
|
dryRun: ${{ inputs.dryRun }}
|
||||||
testMerge: ${{ inputs.testMerge }}
|
testMerge: ${{ inputs.testMerge }}
|
||||||
|
|||||||
3
src/phreeqcpp/.github/subtrees.json
vendored
3
src/phreeqcpp/.github/subtrees.json
vendored
@ -1,7 +1,6 @@
|
|||||||
[
|
[
|
||||||
{
|
{
|
||||||
"prefix": "common",
|
"prefix": "common",
|
||||||
"url": "git@${CI_SERVER_HOST}:${GROUP}-subtrees/phreeqc3-src-common.git",
|
|
||||||
"repo": "usgs-coupled-subtrees/phreeqc3-src-common"
|
"repo": "usgs-coupled-subtrees/phreeqc3-src-common"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|||||||
8
src/phreeqcpp/.github/superprojects.json
vendored
Normal file
8
src/phreeqcpp/.github/superprojects.json
vendored
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
{
|
||||||
|
"usgs-coupled-subtrees/phreeqc3-src": {
|
||||||
|
"superprojects": [
|
||||||
|
"usgs-coupled-subtrees/iphreeqc-src",
|
||||||
|
"usgs-coupled-subtrees/phreeqc3"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -17,6 +17,6 @@ jobs:
|
|||||||
CI_SERVER_HOST: github.com
|
CI_SERVER_HOST: github.com
|
||||||
GROUP: usgs-coupled
|
GROUP: usgs-coupled
|
||||||
steps:
|
steps:
|
||||||
- uses: usgs-coupled/sync-subtrees-action/lint-subtrees/@main
|
- uses: usgs-coupled-subtrees/sync-subtrees-action/lint-subtrees/@main
|
||||||
with:
|
with:
|
||||||
ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
|
ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
|
||||||
|
|||||||
11
src/phreeqcpp/.github/workflows/subtree.yml
vendored
11
src/phreeqcpp/.github/workflows/subtree.yml
vendored
@ -1,12 +1,15 @@
|
|||||||
name: Sync Subtrees
|
name: Sync Subtrees
|
||||||
|
|
||||||
on:
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- master
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
inputs:
|
inputs:
|
||||||
dryRun:
|
dryRun:
|
||||||
description: 'If true, don’t push any changes (for testing only).'
|
description: 'If true, don’t push any changes (for testing only).'
|
||||||
required: true
|
required: true
|
||||||
default: true
|
default: false
|
||||||
type: boolean
|
type: boolean
|
||||||
testMerge:
|
testMerge:
|
||||||
description: 'Run in test mode, pushing to a test branch.'
|
description: 'Run in test mode, pushing to a test branch.'
|
||||||
@ -16,13 +19,15 @@ on:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
sync-subtrees:
|
sync-subtrees:
|
||||||
|
if: startsWith(github.repository, 'usgs-coupled-subtrees/')
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
env:
|
env:
|
||||||
CI_SERVER_HOST: github.com
|
CI_SERVER_HOST: github.com
|
||||||
GROUP: usgs-coupled
|
GROUP: usgs-coupled
|
||||||
|
GH_TOKEN: ${{ secrets.WORKFLOW_PAT }}
|
||||||
steps:
|
steps:
|
||||||
- name: Run sync-subtrees-action
|
- name: Run sync-subtrees-action
|
||||||
uses: usgs-coupled/sync-subtrees-action@main
|
uses: usgs-coupled-subtrees/sync-subtrees-action@main
|
||||||
with:
|
with:
|
||||||
dryRun: ${{ inputs.dryRun }}
|
dryRun: ${{ inputs.dryRun }}
|
||||||
testMerge: ${{ inputs.testMerge }}
|
testMerge: ${{ inputs.testMerge }}
|
||||||
|
|||||||
1
src/phreeqcpp/common/.github/subtrees.json
vendored
Normal file
1
src/phreeqcpp/common/.github/subtrees.json
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
[]
|
||||||
8
src/phreeqcpp/common/.github/superprojects.json
vendored
Normal file
8
src/phreeqcpp/common/.github/superprojects.json
vendored
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
{
|
||||||
|
"usgs-coupled-subtrees/phreeqc3-src-common": {
|
||||||
|
"superprojects": [
|
||||||
|
"usgs-coupled-subtrees/phreeqc3-src",
|
||||||
|
"usgs-coupled-subtrees/wphast"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
16
src/phreeqcpp/common/.github/workflows/lint-superprojects.yml
vendored
Normal file
16
src/phreeqcpp/common/.github/workflows/lint-superprojects.yml
vendored
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
name: Lint superprojects.json
|
||||||
|
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
paths:
|
||||||
|
- '.github/superprojects.json'
|
||||||
|
workflow_call:
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
lint-superprojects:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: usgs-coupled-subtrees/sync-subtrees-action/lint-superprojects/@main
|
||||||
|
with:
|
||||||
|
ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
|
||||||
37
src/phreeqcpp/common/.github/workflows/subtree.yml
vendored
Normal file
37
src/phreeqcpp/common/.github/workflows/subtree.yml
vendored
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
name: Sync Subtrees
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- master
|
||||||
|
workflow_dispatch:
|
||||||
|
inputs:
|
||||||
|
dryRun:
|
||||||
|
description: 'If true, don’t push any changes (for testing only).'
|
||||||
|
required: true
|
||||||
|
default: false
|
||||||
|
type: boolean
|
||||||
|
testMerge:
|
||||||
|
description: 'Run in test mode, pushing to a test branch.'
|
||||||
|
required: true
|
||||||
|
default: false
|
||||||
|
type: boolean
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
sync-subtrees:
|
||||||
|
if: startsWith(github.repository, 'usgs-coupled-subtrees/')
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
env:
|
||||||
|
CI_SERVER_HOST: github.com
|
||||||
|
GROUP: usgs-coupled
|
||||||
|
GH_TOKEN: ${{ secrets.WORKFLOW_PAT }}
|
||||||
|
steps:
|
||||||
|
- name: Run sync-subtrees-action
|
||||||
|
uses: usgs-coupled-subtrees/sync-subtrees-action@main
|
||||||
|
with:
|
||||||
|
dryRun: ${{ inputs.dryRun }}
|
||||||
|
testMerge: ${{ inputs.testMerge }}
|
||||||
|
repository_name: ${{ github.event.repository.name }}
|
||||||
|
default_branch: ${{ github.event.repository.default_branch }}
|
||||||
|
run_number: ${{ github.run_number }}
|
||||||
|
ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }}
|
||||||
Loading…
x
Reference in New Issue
Block a user