From 4a0e162b91bab857cd67097395147cdc665558a1 Mon Sep 17 00:00:00 2001 From: "Charlton, Scott R." Date: Wed, 6 Aug 2025 16:46:25 -0600 Subject: [PATCH 01/15] 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. --- .github/subtrees.json | 37 +++++++++++++++++++ .github/workflows/lint-subtrees.yml | 19 ++++++++++ .github/workflows/subtree.yml | 37 +++++++++++++++++++ database/.github/subtrees.json | 1 + database/.github/superprojects.json | 11 ++++++ database/.github/workflows/lint-subtrees.yml | 19 ++++++++++ .../.github/workflows/lint-superprojects.yml | 20 ++++++++++ database/.github/workflows/subtree.yml | 37 +++++++++++++++++++ examples/c/.github/subtrees.json | 1 + examples/c/.github/superprojects.json | 9 +++++ .../c/.github/workflows/lint-subtrees.yml | 19 ++++++++++ .../.github/workflows/lint-superprojects.yml | 16 ++++++++ examples/c/.github/workflows/subtree.yml | 37 +++++++++++++++++++ examples/com/.github/subtrees.json | 1 + examples/com/.github/superprojects.json | 9 +++++ .../com/.github/workflows/lint-subtrees.yml | 19 ++++++++++ .../.github/workflows/lint-superprojects.yml | 16 ++++++++ examples/com/.github/workflows/subtree.yml | 37 +++++++++++++++++++ examples/fortran/.github/subtrees.json | 1 + examples/fortran/.github/superprojects.json | 9 +++++ .../.github/workflows/lint-subtrees.yml | 19 ++++++++++ .../.github/workflows/lint-superprojects.yml | 16 ++++++++ .../fortran/.github/workflows/subtree.yml | 37 +++++++++++++++++++ phreeqc3-doc/.github/subtrees.json | 1 + phreeqc3-doc/.github/superprojects.json | 10 +++++ .../.github/workflows/lint-subtrees.yml | 19 ++++++++++ .../.github/workflows/lint-superprojects.yml | 16 ++++++++ phreeqc3-doc/.github/workflows/subtree.yml | 37 +++++++++++++++++++ phreeqc3-examples/.github/subtrees.json | 1 + .../.github/workflows/lint-subtrees.yml | 19 ++++++++++ .../.github/workflows/subtree.yml | 37 +++++++++++++++++++ src/.github/subtrees.json | 7 ++++ src/.github/superprojects.json | 9 +++++ src/.github/workflows/lint-subtrees.yml | 22 +++++++++++ src/.github/workflows/lint-superprojects.yml | 16 ++++++++ src/.github/workflows/subtree.yml | 37 +++++++++++++++++++ src/phreeqcpp/.github/subtrees.json | 7 ++++ src/phreeqcpp/.github/superprojects.json | 8 ++++ .../.github/workflows/lint-subtrees.yml | 22 +++++++++++ src/phreeqcpp/.github/workflows/subtree.yml | 37 +++++++++++++++++++ .../common/.github/superprojects.json | 7 ++++ .../.github/workflows/lint-superprojects.yml | 16 ++++++++ .../common/.github/workflows/subtree.yml | 37 +++++++++++++++++++ 43 files changed, 792 insertions(+) create mode 100644 .github/subtrees.json create mode 100644 .github/workflows/lint-subtrees.yml create mode 100644 .github/workflows/subtree.yml create mode 100644 database/.github/subtrees.json create mode 100644 database/.github/superprojects.json create mode 100644 database/.github/workflows/lint-subtrees.yml create mode 100644 database/.github/workflows/lint-superprojects.yml create mode 100644 database/.github/workflows/subtree.yml create mode 100644 examples/c/.github/subtrees.json create mode 100644 examples/c/.github/superprojects.json create mode 100644 examples/c/.github/workflows/lint-subtrees.yml create mode 100644 examples/c/.github/workflows/lint-superprojects.yml create mode 100644 examples/c/.github/workflows/subtree.yml create mode 100644 examples/com/.github/subtrees.json create mode 100644 examples/com/.github/superprojects.json create mode 100644 examples/com/.github/workflows/lint-subtrees.yml create mode 100644 examples/com/.github/workflows/lint-superprojects.yml create mode 100644 examples/com/.github/workflows/subtree.yml create mode 100644 examples/fortran/.github/subtrees.json create mode 100644 examples/fortran/.github/superprojects.json create mode 100644 examples/fortran/.github/workflows/lint-subtrees.yml create mode 100644 examples/fortran/.github/workflows/lint-superprojects.yml create mode 100644 examples/fortran/.github/workflows/subtree.yml create mode 100644 phreeqc3-doc/.github/subtrees.json create mode 100644 phreeqc3-doc/.github/superprojects.json create mode 100644 phreeqc3-doc/.github/workflows/lint-subtrees.yml create mode 100644 phreeqc3-doc/.github/workflows/lint-superprojects.yml create mode 100644 phreeqc3-doc/.github/workflows/subtree.yml create mode 100644 phreeqc3-examples/.github/subtrees.json create mode 100644 phreeqc3-examples/.github/workflows/lint-subtrees.yml create mode 100644 phreeqc3-examples/.github/workflows/subtree.yml create mode 100644 src/.github/subtrees.json create mode 100644 src/.github/superprojects.json create mode 100644 src/.github/workflows/lint-subtrees.yml create mode 100644 src/.github/workflows/lint-superprojects.yml create mode 100644 src/.github/workflows/subtree.yml create mode 100644 src/phreeqcpp/.github/subtrees.json create mode 100644 src/phreeqcpp/.github/superprojects.json create mode 100644 src/phreeqcpp/.github/workflows/lint-subtrees.yml create mode 100644 src/phreeqcpp/.github/workflows/subtree.yml create mode 100644 src/phreeqcpp/common/.github/superprojects.json create mode 100644 src/phreeqcpp/common/.github/workflows/lint-superprojects.yml create mode 100644 src/phreeqcpp/common/.github/workflows/subtree.yml diff --git a/.github/subtrees.json b/.github/subtrees.json new file mode 100644 index 00000000..2e7193a9 --- /dev/null +++ b/.github/subtrees.json @@ -0,0 +1,37 @@ +[ + { + "prefix": "src", + "url": "git@${CI_SERVER_HOST}:${GROUP}-subtrees/iphreeqc-src.git", + "repo": "usgs-coupled-subtrees/iphreeqc-src" + }, + { + "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" + }, + { + "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" + }, + { + "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" + }, + { + "prefix": "database", + "url": "git@${CI_SERVER_HOST}:${GROUP}-subtrees/phreeqc3-database.git", + "repo": "usgs-coupled-subtrees/phreeqc3-database" + }, + { + "prefix": "phreeqc3-doc", + "url": "git@${CI_SERVER_HOST}:${GROUP}-subtrees/phreeqc3-doc.git", + "repo": "usgs-coupled-subtrees/phreeqc3-doc" + }, + { + "prefix": "phreeqc3-examples", + "url": "git@${CI_SERVER_HOST}:${GROUP}-subtrees/phreeqc3-examples.git", + "repo": "usgs-coupled-subtrees/phreeqc3-examples" + } +] \ No newline at end of file diff --git a/.github/workflows/lint-subtrees.yml b/.github/workflows/lint-subtrees.yml new file mode 100644 index 00000000..71d8e58f --- /dev/null +++ b/.github/workflows/lint-subtrees.yml @@ -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 }} diff --git a/.github/workflows/subtree.yml b/.github/workflows/subtree.yml new file mode 100644 index 00000000..b4527205 --- /dev/null +++ b/.github/workflows/subtree.yml @@ -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 }} diff --git a/database/.github/subtrees.json b/database/.github/subtrees.json new file mode 100644 index 00000000..fe51488c --- /dev/null +++ b/database/.github/subtrees.json @@ -0,0 +1 @@ +[] diff --git a/database/.github/superprojects.json b/database/.github/superprojects.json new file mode 100644 index 00000000..c1048e5a --- /dev/null +++ b/database/.github/superprojects.json @@ -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" + ] + } +} diff --git a/database/.github/workflows/lint-subtrees.yml b/database/.github/workflows/lint-subtrees.yml new file mode 100644 index 00000000..71d8e58f --- /dev/null +++ b/database/.github/workflows/lint-subtrees.yml @@ -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 }} diff --git a/database/.github/workflows/lint-superprojects.yml b/database/.github/workflows/lint-superprojects.yml new file mode 100644 index 00000000..c157704f --- /dev/null +++ b/database/.github/workflows/lint-superprojects.yml @@ -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 + diff --git a/database/.github/workflows/subtree.yml b/database/.github/workflows/subtree.yml new file mode 100644 index 00000000..b4527205 --- /dev/null +++ b/database/.github/workflows/subtree.yml @@ -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 }} diff --git a/examples/c/.github/subtrees.json b/examples/c/.github/subtrees.json new file mode 100644 index 00000000..fe51488c --- /dev/null +++ b/examples/c/.github/subtrees.json @@ -0,0 +1 @@ +[] diff --git a/examples/c/.github/superprojects.json b/examples/c/.github/superprojects.json new file mode 100644 index 00000000..c04bbc0d --- /dev/null +++ b/examples/c/.github/superprojects.json @@ -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" + ] + } +} diff --git a/examples/c/.github/workflows/lint-subtrees.yml b/examples/c/.github/workflows/lint-subtrees.yml new file mode 100644 index 00000000..71d8e58f --- /dev/null +++ b/examples/c/.github/workflows/lint-subtrees.yml @@ -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 }} diff --git a/examples/c/.github/workflows/lint-superprojects.yml b/examples/c/.github/workflows/lint-superprojects.yml new file mode 100644 index 00000000..b46ff4bc --- /dev/null +++ b/examples/c/.github/workflows/lint-superprojects.yml @@ -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 }} diff --git a/examples/c/.github/workflows/subtree.yml b/examples/c/.github/workflows/subtree.yml new file mode 100644 index 00000000..b4527205 --- /dev/null +++ b/examples/c/.github/workflows/subtree.yml @@ -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 }} diff --git a/examples/com/.github/subtrees.json b/examples/com/.github/subtrees.json new file mode 100644 index 00000000..fe51488c --- /dev/null +++ b/examples/com/.github/subtrees.json @@ -0,0 +1 @@ +[] diff --git a/examples/com/.github/superprojects.json b/examples/com/.github/superprojects.json new file mode 100644 index 00000000..b865fe72 --- /dev/null +++ b/examples/com/.github/superprojects.json @@ -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" + ] + } +} diff --git a/examples/com/.github/workflows/lint-subtrees.yml b/examples/com/.github/workflows/lint-subtrees.yml new file mode 100644 index 00000000..71d8e58f --- /dev/null +++ b/examples/com/.github/workflows/lint-subtrees.yml @@ -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 }} diff --git a/examples/com/.github/workflows/lint-superprojects.yml b/examples/com/.github/workflows/lint-superprojects.yml new file mode 100644 index 00000000..b46ff4bc --- /dev/null +++ b/examples/com/.github/workflows/lint-superprojects.yml @@ -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 }} diff --git a/examples/com/.github/workflows/subtree.yml b/examples/com/.github/workflows/subtree.yml new file mode 100644 index 00000000..b4527205 --- /dev/null +++ b/examples/com/.github/workflows/subtree.yml @@ -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 }} diff --git a/examples/fortran/.github/subtrees.json b/examples/fortran/.github/subtrees.json new file mode 100644 index 00000000..fe51488c --- /dev/null +++ b/examples/fortran/.github/subtrees.json @@ -0,0 +1 @@ +[] diff --git a/examples/fortran/.github/superprojects.json b/examples/fortran/.github/superprojects.json new file mode 100644 index 00000000..951d3f2d --- /dev/null +++ b/examples/fortran/.github/superprojects.json @@ -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" + ] + } +} diff --git a/examples/fortran/.github/workflows/lint-subtrees.yml b/examples/fortran/.github/workflows/lint-subtrees.yml new file mode 100644 index 00000000..71d8e58f --- /dev/null +++ b/examples/fortran/.github/workflows/lint-subtrees.yml @@ -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 }} diff --git a/examples/fortran/.github/workflows/lint-superprojects.yml b/examples/fortran/.github/workflows/lint-superprojects.yml new file mode 100644 index 00000000..b46ff4bc --- /dev/null +++ b/examples/fortran/.github/workflows/lint-superprojects.yml @@ -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 }} diff --git a/examples/fortran/.github/workflows/subtree.yml b/examples/fortran/.github/workflows/subtree.yml new file mode 100644 index 00000000..b4527205 --- /dev/null +++ b/examples/fortran/.github/workflows/subtree.yml @@ -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 }} diff --git a/phreeqc3-doc/.github/subtrees.json b/phreeqc3-doc/.github/subtrees.json new file mode 100644 index 00000000..fe51488c --- /dev/null +++ b/phreeqc3-doc/.github/subtrees.json @@ -0,0 +1 @@ +[] diff --git a/phreeqc3-doc/.github/superprojects.json b/phreeqc3-doc/.github/superprojects.json new file mode 100644 index 00000000..837f958a --- /dev/null +++ b/phreeqc3-doc/.github/superprojects.json @@ -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" + ] + } +} diff --git a/phreeqc3-doc/.github/workflows/lint-subtrees.yml b/phreeqc3-doc/.github/workflows/lint-subtrees.yml new file mode 100644 index 00000000..71d8e58f --- /dev/null +++ b/phreeqc3-doc/.github/workflows/lint-subtrees.yml @@ -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 }} diff --git a/phreeqc3-doc/.github/workflows/lint-superprojects.yml b/phreeqc3-doc/.github/workflows/lint-superprojects.yml new file mode 100644 index 00000000..b46ff4bc --- /dev/null +++ b/phreeqc3-doc/.github/workflows/lint-superprojects.yml @@ -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 }} diff --git a/phreeqc3-doc/.github/workflows/subtree.yml b/phreeqc3-doc/.github/workflows/subtree.yml new file mode 100644 index 00000000..b4527205 --- /dev/null +++ b/phreeqc3-doc/.github/workflows/subtree.yml @@ -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 }} diff --git a/phreeqc3-examples/.github/subtrees.json b/phreeqc3-examples/.github/subtrees.json new file mode 100644 index 00000000..fe51488c --- /dev/null +++ b/phreeqc3-examples/.github/subtrees.json @@ -0,0 +1 @@ +[] diff --git a/phreeqc3-examples/.github/workflows/lint-subtrees.yml b/phreeqc3-examples/.github/workflows/lint-subtrees.yml new file mode 100644 index 00000000..71d8e58f --- /dev/null +++ b/phreeqc3-examples/.github/workflows/lint-subtrees.yml @@ -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 }} diff --git a/phreeqc3-examples/.github/workflows/subtree.yml b/phreeqc3-examples/.github/workflows/subtree.yml new file mode 100644 index 00000000..b4527205 --- /dev/null +++ b/phreeqc3-examples/.github/workflows/subtree.yml @@ -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 }} diff --git a/src/.github/subtrees.json b/src/.github/subtrees.json new file mode 100644 index 00000000..352be8c8 --- /dev/null +++ b/src/.github/subtrees.json @@ -0,0 +1,7 @@ +[ + { + "prefix": "phreeqcpp", + "url": "git@${CI_SERVER_HOST}:${GROUP}-subtrees/phreeqc3-src.git", + "repo": "usgs-coupled-subtrees/phreeqc3-src" + } +] \ No newline at end of file diff --git a/src/.github/superprojects.json b/src/.github/superprojects.json new file mode 100644 index 00000000..bbc77cf2 --- /dev/null +++ b/src/.github/superprojects.json @@ -0,0 +1,9 @@ +{ + "usgs-coupled-subtrees/iphreeqc-src": { + "superprojects": [ + "usgs-coupled-subtrees/iphreeqc", + "usgs-coupled-subtrees/iphreeqccom", + "usgs-coupled-subtrees/phreeqcrm-src" + ] + } +} diff --git a/src/.github/workflows/lint-subtrees.yml b/src/.github/workflows/lint-subtrees.yml new file mode 100644 index 00000000..7af56b67 --- /dev/null +++ b/src/.github/workflows/lint-subtrees.yml @@ -0,0 +1,22 @@ +# This workflow lints the subtrees.json file to ensure it is valid and up-to-date. +# It is triggered on pull requests that modify the subtrees.json file or can be run manually +# via the GitHub Actions UI. +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 }} diff --git a/src/.github/workflows/lint-superprojects.yml b/src/.github/workflows/lint-superprojects.yml new file mode 100644 index 00000000..b46ff4bc --- /dev/null +++ b/src/.github/workflows/lint-superprojects.yml @@ -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 }} diff --git a/src/.github/workflows/subtree.yml b/src/.github/workflows/subtree.yml new file mode 100644 index 00000000..b4527205 --- /dev/null +++ b/src/.github/workflows/subtree.yml @@ -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 }} diff --git a/src/phreeqcpp/.github/subtrees.json b/src/phreeqcpp/.github/subtrees.json new file mode 100644 index 00000000..ff31b0dd --- /dev/null +++ b/src/phreeqcpp/.github/subtrees.json @@ -0,0 +1,7 @@ +[ + { + "prefix": "common", + "url": "git@${CI_SERVER_HOST}:${GROUP}-subtrees/phreeqc3-src-common.git", + "repo": "usgs-coupled-subtrees/phreeqc3-src-common" + } +] \ No newline at end of file diff --git a/src/phreeqcpp/.github/superprojects.json b/src/phreeqcpp/.github/superprojects.json new file mode 100644 index 00000000..97e0591c --- /dev/null +++ b/src/phreeqcpp/.github/superprojects.json @@ -0,0 +1,8 @@ +{ + "usgs-coupled-subtrees/phreeqc3-src": { + "superprojects": [ + "usgs-coupled-subtrees/iphreeqc-src", + "usgs-coupled-subtrees/phreeqc3" + ] + } +} diff --git a/src/phreeqcpp/.github/workflows/lint-subtrees.yml b/src/phreeqcpp/.github/workflows/lint-subtrees.yml new file mode 100644 index 00000000..7af56b67 --- /dev/null +++ b/src/phreeqcpp/.github/workflows/lint-subtrees.yml @@ -0,0 +1,22 @@ +# This workflow lints the subtrees.json file to ensure it is valid and up-to-date. +# It is triggered on pull requests that modify the subtrees.json file or can be run manually +# via the GitHub Actions UI. +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 }} diff --git a/src/phreeqcpp/.github/workflows/subtree.yml b/src/phreeqcpp/.github/workflows/subtree.yml new file mode 100644 index 00000000..b4527205 --- /dev/null +++ b/src/phreeqcpp/.github/workflows/subtree.yml @@ -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 }} diff --git a/src/phreeqcpp/common/.github/superprojects.json b/src/phreeqcpp/common/.github/superprojects.json new file mode 100644 index 00000000..89a9ab74 --- /dev/null +++ b/src/phreeqcpp/common/.github/superprojects.json @@ -0,0 +1,7 @@ +{ + "usgs-coupled-subtrees/phreeqc3-src-common": { + "superprojects": [ + "usgs-coupled-subtrees/phreeqc3-src" + ] + } +} diff --git a/src/phreeqcpp/common/.github/workflows/lint-superprojects.yml b/src/phreeqcpp/common/.github/workflows/lint-superprojects.yml new file mode 100644 index 00000000..b46ff4bc --- /dev/null +++ b/src/phreeqcpp/common/.github/workflows/lint-superprojects.yml @@ -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 }} diff --git a/src/phreeqcpp/common/.github/workflows/subtree.yml b/src/phreeqcpp/common/.github/workflows/subtree.yml new file mode 100644 index 00000000..b4527205 --- /dev/null +++ b/src/phreeqcpp/common/.github/workflows/subtree.yml @@ -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 }} From e2bd17174b917c46184eaf107ea7add8f4b328e6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 6 Aug 2025 22:48:13 +0000 Subject: [PATCH 02/15] Squashed 'src/' changes from b15a6bde..b33a48e2 b33a48e2 Add workflows and configuration for syncing and linting subtrees git-subtree-dir: src git-subtree-split: b33a48e2bab452868b846a242ce3ac8ba7e4748f --- .github/subtrees.json | 7 ++++ .github/superprojects.json | 9 +++++ .github/workflows/lint-subtrees.yml | 22 +++++++++++ .github/workflows/lint-superprojects.yml | 16 ++++++++ .github/workflows/subtree.yml | 37 +++++++++++++++++++ phreeqcpp/.github/subtrees.json | 7 ++++ phreeqcpp/.github/superprojects.json | 8 ++++ phreeqcpp/.github/workflows/lint-subtrees.yml | 22 +++++++++++ phreeqcpp/.github/workflows/subtree.yml | 37 +++++++++++++++++++ phreeqcpp/common/.github/superprojects.json | 7 ++++ .../.github/workflows/lint-superprojects.yml | 16 ++++++++ .../common/.github/workflows/subtree.yml | 37 +++++++++++++++++++ 12 files changed, 225 insertions(+) create mode 100644 .github/subtrees.json create mode 100644 .github/superprojects.json create mode 100644 .github/workflows/lint-subtrees.yml create mode 100644 .github/workflows/lint-superprojects.yml create mode 100644 .github/workflows/subtree.yml create mode 100644 phreeqcpp/.github/subtrees.json create mode 100644 phreeqcpp/.github/superprojects.json create mode 100644 phreeqcpp/.github/workflows/lint-subtrees.yml create mode 100644 phreeqcpp/.github/workflows/subtree.yml create mode 100644 phreeqcpp/common/.github/superprojects.json create mode 100644 phreeqcpp/common/.github/workflows/lint-superprojects.yml create mode 100644 phreeqcpp/common/.github/workflows/subtree.yml diff --git a/.github/subtrees.json b/.github/subtrees.json new file mode 100644 index 00000000..352be8c8 --- /dev/null +++ b/.github/subtrees.json @@ -0,0 +1,7 @@ +[ + { + "prefix": "phreeqcpp", + "url": "git@${CI_SERVER_HOST}:${GROUP}-subtrees/phreeqc3-src.git", + "repo": "usgs-coupled-subtrees/phreeqc3-src" + } +] \ No newline at end of file diff --git a/.github/superprojects.json b/.github/superprojects.json new file mode 100644 index 00000000..bbc77cf2 --- /dev/null +++ b/.github/superprojects.json @@ -0,0 +1,9 @@ +{ + "usgs-coupled-subtrees/iphreeqc-src": { + "superprojects": [ + "usgs-coupled-subtrees/iphreeqc", + "usgs-coupled-subtrees/iphreeqccom", + "usgs-coupled-subtrees/phreeqcrm-src" + ] + } +} diff --git a/.github/workflows/lint-subtrees.yml b/.github/workflows/lint-subtrees.yml new file mode 100644 index 00000000..7af56b67 --- /dev/null +++ b/.github/workflows/lint-subtrees.yml @@ -0,0 +1,22 @@ +# This workflow lints the subtrees.json file to ensure it is valid and up-to-date. +# It is triggered on pull requests that modify the subtrees.json file or can be run manually +# via the GitHub Actions UI. +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 }} diff --git a/.github/workflows/lint-superprojects.yml b/.github/workflows/lint-superprojects.yml new file mode 100644 index 00000000..b46ff4bc --- /dev/null +++ b/.github/workflows/lint-superprojects.yml @@ -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 }} diff --git a/.github/workflows/subtree.yml b/.github/workflows/subtree.yml new file mode 100644 index 00000000..b4527205 --- /dev/null +++ b/.github/workflows/subtree.yml @@ -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 }} diff --git a/phreeqcpp/.github/subtrees.json b/phreeqcpp/.github/subtrees.json new file mode 100644 index 00000000..ff31b0dd --- /dev/null +++ b/phreeqcpp/.github/subtrees.json @@ -0,0 +1,7 @@ +[ + { + "prefix": "common", + "url": "git@${CI_SERVER_HOST}:${GROUP}-subtrees/phreeqc3-src-common.git", + "repo": "usgs-coupled-subtrees/phreeqc3-src-common" + } +] \ No newline at end of file diff --git a/phreeqcpp/.github/superprojects.json b/phreeqcpp/.github/superprojects.json new file mode 100644 index 00000000..97e0591c --- /dev/null +++ b/phreeqcpp/.github/superprojects.json @@ -0,0 +1,8 @@ +{ + "usgs-coupled-subtrees/phreeqc3-src": { + "superprojects": [ + "usgs-coupled-subtrees/iphreeqc-src", + "usgs-coupled-subtrees/phreeqc3" + ] + } +} diff --git a/phreeqcpp/.github/workflows/lint-subtrees.yml b/phreeqcpp/.github/workflows/lint-subtrees.yml new file mode 100644 index 00000000..7af56b67 --- /dev/null +++ b/phreeqcpp/.github/workflows/lint-subtrees.yml @@ -0,0 +1,22 @@ +# This workflow lints the subtrees.json file to ensure it is valid and up-to-date. +# It is triggered on pull requests that modify the subtrees.json file or can be run manually +# via the GitHub Actions UI. +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 }} diff --git a/phreeqcpp/.github/workflows/subtree.yml b/phreeqcpp/.github/workflows/subtree.yml new file mode 100644 index 00000000..b4527205 --- /dev/null +++ b/phreeqcpp/.github/workflows/subtree.yml @@ -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 }} diff --git a/phreeqcpp/common/.github/superprojects.json b/phreeqcpp/common/.github/superprojects.json new file mode 100644 index 00000000..89a9ab74 --- /dev/null +++ b/phreeqcpp/common/.github/superprojects.json @@ -0,0 +1,7 @@ +{ + "usgs-coupled-subtrees/phreeqc3-src-common": { + "superprojects": [ + "usgs-coupled-subtrees/phreeqc3-src" + ] + } +} diff --git a/phreeqcpp/common/.github/workflows/lint-superprojects.yml b/phreeqcpp/common/.github/workflows/lint-superprojects.yml new file mode 100644 index 00000000..b46ff4bc --- /dev/null +++ b/phreeqcpp/common/.github/workflows/lint-superprojects.yml @@ -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 }} diff --git a/phreeqcpp/common/.github/workflows/subtree.yml b/phreeqcpp/common/.github/workflows/subtree.yml new file mode 100644 index 00000000..b4527205 --- /dev/null +++ b/phreeqcpp/common/.github/workflows/subtree.yml @@ -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 }} From 12119014f706723cce192eee04b88f39c96686e7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 6 Aug 2025 22:48:14 +0000 Subject: [PATCH 03/15] 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 --- .github/subtrees.json | 1 + .github/superprojects.json | 9 ++++++ .github/workflows/lint-subtrees.yml | 19 ++++++++++++ .github/workflows/lint-superprojects.yml | 16 ++++++++++ .github/workflows/subtree.yml | 37 ++++++++++++++++++++++++ 5 files changed, 82 insertions(+) create mode 100644 .github/subtrees.json create mode 100644 .github/superprojects.json create mode 100644 .github/workflows/lint-subtrees.yml create mode 100644 .github/workflows/lint-superprojects.yml create mode 100644 .github/workflows/subtree.yml diff --git a/.github/subtrees.json b/.github/subtrees.json new file mode 100644 index 00000000..fe51488c --- /dev/null +++ b/.github/subtrees.json @@ -0,0 +1 @@ +[] diff --git a/.github/superprojects.json b/.github/superprojects.json new file mode 100644 index 00000000..c04bbc0d --- /dev/null +++ b/.github/superprojects.json @@ -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" + ] + } +} diff --git a/.github/workflows/lint-subtrees.yml b/.github/workflows/lint-subtrees.yml new file mode 100644 index 00000000..71d8e58f --- /dev/null +++ b/.github/workflows/lint-subtrees.yml @@ -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 }} diff --git a/.github/workflows/lint-superprojects.yml b/.github/workflows/lint-superprojects.yml new file mode 100644 index 00000000..b46ff4bc --- /dev/null +++ b/.github/workflows/lint-superprojects.yml @@ -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 }} diff --git a/.github/workflows/subtree.yml b/.github/workflows/subtree.yml new file mode 100644 index 00000000..b4527205 --- /dev/null +++ b/.github/workflows/subtree.yml @@ -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 }} From dc7a88c8c0b3206fe183e81736b77cbcfa7c8ec4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 6 Aug 2025 22:48:15 +0000 Subject: [PATCH 04/15] 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 --- .github/subtrees.json | 1 + .github/superprojects.json | 9 ++++++ .github/workflows/lint-subtrees.yml | 19 ++++++++++++ .github/workflows/lint-superprojects.yml | 16 ++++++++++ .github/workflows/subtree.yml | 37 ++++++++++++++++++++++++ 5 files changed, 82 insertions(+) create mode 100644 .github/subtrees.json create mode 100644 .github/superprojects.json create mode 100644 .github/workflows/lint-subtrees.yml create mode 100644 .github/workflows/lint-superprojects.yml create mode 100644 .github/workflows/subtree.yml diff --git a/.github/subtrees.json b/.github/subtrees.json new file mode 100644 index 00000000..fe51488c --- /dev/null +++ b/.github/subtrees.json @@ -0,0 +1 @@ +[] diff --git a/.github/superprojects.json b/.github/superprojects.json new file mode 100644 index 00000000..b865fe72 --- /dev/null +++ b/.github/superprojects.json @@ -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" + ] + } +} diff --git a/.github/workflows/lint-subtrees.yml b/.github/workflows/lint-subtrees.yml new file mode 100644 index 00000000..71d8e58f --- /dev/null +++ b/.github/workflows/lint-subtrees.yml @@ -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 }} diff --git a/.github/workflows/lint-superprojects.yml b/.github/workflows/lint-superprojects.yml new file mode 100644 index 00000000..b46ff4bc --- /dev/null +++ b/.github/workflows/lint-superprojects.yml @@ -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 }} diff --git a/.github/workflows/subtree.yml b/.github/workflows/subtree.yml new file mode 100644 index 00000000..b4527205 --- /dev/null +++ b/.github/workflows/subtree.yml @@ -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 }} From eead2b365915e5b65f4840e5f3fac5a0c4de749b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 6 Aug 2025 22:48:16 +0000 Subject: [PATCH 05/15] 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 --- .github/subtrees.json | 1 + .github/superprojects.json | 9 ++++++ .github/workflows/lint-subtrees.yml | 19 ++++++++++++ .github/workflows/lint-superprojects.yml | 16 ++++++++++ .github/workflows/subtree.yml | 37 ++++++++++++++++++++++++ 5 files changed, 82 insertions(+) create mode 100644 .github/subtrees.json create mode 100644 .github/superprojects.json create mode 100644 .github/workflows/lint-subtrees.yml create mode 100644 .github/workflows/lint-superprojects.yml create mode 100644 .github/workflows/subtree.yml diff --git a/.github/subtrees.json b/.github/subtrees.json new file mode 100644 index 00000000..fe51488c --- /dev/null +++ b/.github/subtrees.json @@ -0,0 +1 @@ +[] diff --git a/.github/superprojects.json b/.github/superprojects.json new file mode 100644 index 00000000..951d3f2d --- /dev/null +++ b/.github/superprojects.json @@ -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" + ] + } +} diff --git a/.github/workflows/lint-subtrees.yml b/.github/workflows/lint-subtrees.yml new file mode 100644 index 00000000..71d8e58f --- /dev/null +++ b/.github/workflows/lint-subtrees.yml @@ -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 }} diff --git a/.github/workflows/lint-superprojects.yml b/.github/workflows/lint-superprojects.yml new file mode 100644 index 00000000..b46ff4bc --- /dev/null +++ b/.github/workflows/lint-superprojects.yml @@ -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 }} diff --git a/.github/workflows/subtree.yml b/.github/workflows/subtree.yml new file mode 100644 index 00000000..b4527205 --- /dev/null +++ b/.github/workflows/subtree.yml @@ -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 }} From 7ad9ab5dc63ff6a4fa4400c19ac9ef8cdefed9c6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 6 Aug 2025 22:48:17 +0000 Subject: [PATCH 06/15] Squashed 'database/' changes from dd98e151..5df53219 5df53219 Add workflows and configuration for syncing and linting subtrees git-subtree-dir: database git-subtree-split: 5df53219e1f6143cee10c67da88317f0dcd00c2b --- .github/subtrees.json | 1 + .github/superprojects.json | 11 +++++++ .github/workflows/lint-subtrees.yml | 19 ++++++++++++ .github/workflows/lint-superprojects.yml | 20 +++++++++++++ .github/workflows/subtree.yml | 37 ++++++++++++++++++++++++ 5 files changed, 88 insertions(+) create mode 100644 .github/subtrees.json create mode 100644 .github/superprojects.json create mode 100644 .github/workflows/lint-subtrees.yml create mode 100644 .github/workflows/lint-superprojects.yml create mode 100644 .github/workflows/subtree.yml diff --git a/.github/subtrees.json b/.github/subtrees.json new file mode 100644 index 00000000..fe51488c --- /dev/null +++ b/.github/subtrees.json @@ -0,0 +1 @@ +[] diff --git a/.github/superprojects.json b/.github/superprojects.json new file mode 100644 index 00000000..c1048e5a --- /dev/null +++ b/.github/superprojects.json @@ -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" + ] + } +} diff --git a/.github/workflows/lint-subtrees.yml b/.github/workflows/lint-subtrees.yml new file mode 100644 index 00000000..71d8e58f --- /dev/null +++ b/.github/workflows/lint-subtrees.yml @@ -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 }} diff --git a/.github/workflows/lint-superprojects.yml b/.github/workflows/lint-superprojects.yml new file mode 100644 index 00000000..c157704f --- /dev/null +++ b/.github/workflows/lint-superprojects.yml @@ -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 + diff --git a/.github/workflows/subtree.yml b/.github/workflows/subtree.yml new file mode 100644 index 00000000..b4527205 --- /dev/null +++ b/.github/workflows/subtree.yml @@ -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 }} From 0a5c6fc279b5f7ba17de9303bf5bbf21c7c56f79 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 6 Aug 2025 22:48:18 +0000 Subject: [PATCH 07/15] 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 --- .github/subtrees.json | 1 + .github/superprojects.json | 10 +++++++ .github/workflows/lint-subtrees.yml | 19 ++++++++++++ .github/workflows/lint-superprojects.yml | 16 ++++++++++ .github/workflows/subtree.yml | 37 ++++++++++++++++++++++++ 5 files changed, 83 insertions(+) create mode 100644 .github/subtrees.json create mode 100644 .github/superprojects.json create mode 100644 .github/workflows/lint-subtrees.yml create mode 100644 .github/workflows/lint-superprojects.yml create mode 100644 .github/workflows/subtree.yml diff --git a/.github/subtrees.json b/.github/subtrees.json new file mode 100644 index 00000000..fe51488c --- /dev/null +++ b/.github/subtrees.json @@ -0,0 +1 @@ +[] diff --git a/.github/superprojects.json b/.github/superprojects.json new file mode 100644 index 00000000..837f958a --- /dev/null +++ b/.github/superprojects.json @@ -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" + ] + } +} diff --git a/.github/workflows/lint-subtrees.yml b/.github/workflows/lint-subtrees.yml new file mode 100644 index 00000000..71d8e58f --- /dev/null +++ b/.github/workflows/lint-subtrees.yml @@ -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 }} diff --git a/.github/workflows/lint-superprojects.yml b/.github/workflows/lint-superprojects.yml new file mode 100644 index 00000000..b46ff4bc --- /dev/null +++ b/.github/workflows/lint-superprojects.yml @@ -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 }} diff --git a/.github/workflows/subtree.yml b/.github/workflows/subtree.yml new file mode 100644 index 00000000..b4527205 --- /dev/null +++ b/.github/workflows/subtree.yml @@ -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 }} From 275553971d84e878866e8e326a6c3766a7e96aaa Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 6 Aug 2025 22:48:19 +0000 Subject: [PATCH 08/15] 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 --- .github/subtrees.json | 1 + .github/workflows/lint-subtrees.yml | 19 +++++++++++++++ .github/workflows/subtree.yml | 37 +++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+) create mode 100644 .github/subtrees.json create mode 100644 .github/workflows/lint-subtrees.yml create mode 100644 .github/workflows/subtree.yml diff --git a/.github/subtrees.json b/.github/subtrees.json new file mode 100644 index 00000000..fe51488c --- /dev/null +++ b/.github/subtrees.json @@ -0,0 +1 @@ +[] diff --git a/.github/workflows/lint-subtrees.yml b/.github/workflows/lint-subtrees.yml new file mode 100644 index 00000000..71d8e58f --- /dev/null +++ b/.github/workflows/lint-subtrees.yml @@ -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 }} diff --git a/.github/workflows/subtree.yml b/.github/workflows/subtree.yml new file mode 100644 index 00000000..b4527205 --- /dev/null +++ b/.github/workflows/subtree.yml @@ -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 }} From 8f505c6f0035e9a9f2cbb5e575247a521025ab13 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 6 Aug 2025 22:49:50 +0000 Subject: [PATCH 09/15] 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 From 846d30ae5211cbabde521d866a67454cd0fe48b0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 14 Aug 2025 00:09:12 +0000 Subject: [PATCH 10/15] 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 --- phreeqcpp/common/.github/subtrees.json | 1 + phreeqcpp/common/.github/superprojects.json | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 phreeqcpp/common/.github/subtrees.json diff --git a/phreeqcpp/common/.github/subtrees.json b/phreeqcpp/common/.github/subtrees.json new file mode 100644 index 00000000..fe51488c --- /dev/null +++ b/phreeqcpp/common/.github/subtrees.json @@ -0,0 +1 @@ +[] diff --git a/phreeqcpp/common/.github/superprojects.json b/phreeqcpp/common/.github/superprojects.json index 89a9ab74..0bf12112 100644 --- a/phreeqcpp/common/.github/superprojects.json +++ b/phreeqcpp/common/.github/superprojects.json @@ -1,7 +1,8 @@ { "usgs-coupled-subtrees/phreeqc3-src-common": { "superprojects": [ - "usgs-coupled-subtrees/phreeqc3-src" + "usgs-coupled-subtrees/phreeqc3-src", + "usgs-coupled-subtrees/wphast" ] } } From 6a6e8c5d188c57e67354794cac6f8b9e4f7398f9 Mon Sep 17 00:00:00 2001 From: "Charlton, Scott R." Date: Thu, 14 Aug 2025 14:41:56 -0600 Subject: [PATCH 11/15] Remove unnecessary URL fields from subtrees.json files --- .github/subtrees.json | 7 ------- src/.github/subtrees.json | 1 - src/phreeqcpp/.github/subtrees.json | 1 - 3 files changed, 9 deletions(-) diff --git a/.github/subtrees.json b/.github/subtrees.json index 2e7193a9..fed22388 100644 --- a/.github/subtrees.json +++ b/.github/subtrees.json @@ -1,37 +1,30 @@ [ { "prefix": "src", - "url": "git@${CI_SERVER_HOST}:${GROUP}-subtrees/iphreeqc-src.git", "repo": "usgs-coupled-subtrees/iphreeqc-src" }, { "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" }, { "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" }, { "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" }, { "prefix": "database", - "url": "git@${CI_SERVER_HOST}:${GROUP}-subtrees/phreeqc3-database.git", "repo": "usgs-coupled-subtrees/phreeqc3-database" }, { "prefix": "phreeqc3-doc", - "url": "git@${CI_SERVER_HOST}:${GROUP}-subtrees/phreeqc3-doc.git", "repo": "usgs-coupled-subtrees/phreeqc3-doc" }, { "prefix": "phreeqc3-examples", - "url": "git@${CI_SERVER_HOST}:${GROUP}-subtrees/phreeqc3-examples.git", "repo": "usgs-coupled-subtrees/phreeqc3-examples" } ] \ No newline at end of file diff --git a/src/.github/subtrees.json b/src/.github/subtrees.json index 352be8c8..d7194d1c 100644 --- a/src/.github/subtrees.json +++ b/src/.github/subtrees.json @@ -1,7 +1,6 @@ [ { "prefix": "phreeqcpp", - "url": "git@${CI_SERVER_HOST}:${GROUP}-subtrees/phreeqc3-src.git", "repo": "usgs-coupled-subtrees/phreeqc3-src" } ] \ No newline at end of file diff --git a/src/phreeqcpp/.github/subtrees.json b/src/phreeqcpp/.github/subtrees.json index ff31b0dd..311cec70 100644 --- a/src/phreeqcpp/.github/subtrees.json +++ b/src/phreeqcpp/.github/subtrees.json @@ -1,7 +1,6 @@ [ { "prefix": "common", - "url": "git@${CI_SERVER_HOST}:${GROUP}-subtrees/phreeqc3-src-common.git", "repo": "usgs-coupled-subtrees/phreeqc3-src-common" } ] \ No newline at end of file From 684223410a9be6ffdb3479c482e1d9a0f4a78823 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 14 Aug 2025 20:43:45 +0000 Subject: [PATCH 12/15] Squashed 'src/' changes from 767640fe..cd19c4bb cd19c4bb Remove unnecessary URL fields from subtrees.json files git-subtree-dir: src git-subtree-split: cd19c4bbf6788abf8a2a03edc5fad50a5c528d7f --- .github/subtrees.json | 1 - phreeqcpp/.github/subtrees.json | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/subtrees.json b/.github/subtrees.json index 352be8c8..d7194d1c 100644 --- a/.github/subtrees.json +++ b/.github/subtrees.json @@ -1,7 +1,6 @@ [ { "prefix": "phreeqcpp", - "url": "git@${CI_SERVER_HOST}:${GROUP}-subtrees/phreeqc3-src.git", "repo": "usgs-coupled-subtrees/phreeqc3-src" } ] \ No newline at end of file diff --git a/phreeqcpp/.github/subtrees.json b/phreeqcpp/.github/subtrees.json index ff31b0dd..311cec70 100644 --- a/phreeqcpp/.github/subtrees.json +++ b/phreeqcpp/.github/subtrees.json @@ -1,7 +1,6 @@ [ { "prefix": "common", - "url": "git@${CI_SERVER_HOST}:${GROUP}-subtrees/phreeqc3-src-common.git", "repo": "usgs-coupled-subtrees/phreeqc3-src-common" } ] \ No newline at end of file From 941a71640e5bb24981ff0ff225a542e46d7ebff5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 14 Aug 2025 20:45:19 +0000 Subject: [PATCH 13/15] 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 From 4d67ec082e78dcdbc4e02ae69a44084fe84bd9f2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 15 Aug 2025 19:12:11 +0000 Subject: [PATCH 14/15] 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 --- .github/subtrees.json | 2 +- phreeqcpp/.github/subtrees.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/subtrees.json b/.github/subtrees.json index d7194d1c..6d6f9b6e 100644 --- a/.github/subtrees.json +++ b/.github/subtrees.json @@ -3,4 +3,4 @@ "prefix": "phreeqcpp", "repo": "usgs-coupled-subtrees/phreeqc3-src" } -] \ No newline at end of file +] diff --git a/phreeqcpp/.github/subtrees.json b/phreeqcpp/.github/subtrees.json index 311cec70..0791105f 100644 --- a/phreeqcpp/.github/subtrees.json +++ b/phreeqcpp/.github/subtrees.json @@ -3,4 +3,4 @@ "prefix": "common", "repo": "usgs-coupled-subtrees/phreeqc3-src-common" } -] \ No newline at end of file +] From a78f34dc797a2b6c997ce986eab419c1a119a98b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 15 Aug 2025 19:13:41 +0000 Subject: [PATCH 15/15] 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