diff --git a/.github/workflows/muelu-sync.yml b/.github/workflows/muelu-sync.yml new file mode 100644 index 000000000000..39ab84bc155e --- /dev/null +++ b/.github/workflows/muelu-sync.yml @@ -0,0 +1,32 @@ +# +# Workflow that mirrors master and develop from the main Trilinos repo +# to the MueLu fork. +# +name: MueLu Sync + +on: + schedule: + - cron: "0 * * * *" + workflow_dispatch: + +jobs: + repo-sync: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + persist-credentials: false + - name: repo-sync-master + uses: repo-sync/github-sync@v2.3.0 + with: + source_repo: https://github.com/trilinos/Trilinos.git + source_branch: master + destination_branch: master + github_token: ${{ secrets.MUELU_SYNC_TOKEN }} + - name: repo-sync-develop + uses: repo-sync/github-sync@v2.3.0 + with: + source_repo: https://github.com/trilinos/Trilinos.git + source_branch: develop + destination_branch: develop + github_token: ${{ secrets.MUELU_SYNC_TOKEN }} diff --git a/.github/workflows/muelu_clang_format.yml b/.github/workflows/muelu_clang_format.yml index fc4ef5e00c34..6dadbafbb25d 100644 --- a/.github/workflows/muelu_clang_format.yml +++ b/.github/workflows/muelu_clang_format.yml @@ -17,11 +17,26 @@ jobs: inplace: true - run: git diff HEAD > format_patch.txt - run: if [ "$(cat format_patch.txt)" == "" ] ; then rm format_patch.txt ; fi - - uses: actions/upload-artifact@v3 + + - uses: actions/upload-artifact@v4 + id: upload-artf if: ${{ hashFiles('format_patch.txt') != '' }} with: name: MueLu format patch path: format_patch.txt + + - name: Artifact ID test + run: | + echo "Artifact ID is ${{ steps.upload-artf.outputs.artifact-id }}" + echo "Link: https://github.com/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID/artifacts/${{ steps.upload-artf.outputs.artifact-id }}" + + - name: Post artifact in issue comment + uses: mshick/add-pr-comment@v2.8.1 + if: ${{ hashFiles('format_patch.txt') != '' }} + with: + message: | + Your PR updated files in MueLu, but does not respect the Clang Formatting. Please apply the patch found [here](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}/artifacts/${{ steps.upload-artf.outputs.artifact-id }}) + - uses: actions/github-script@v3 if: ${{ hashFiles('format_patch.txt') != '' }} with: diff --git a/.github/workflows/tpetra_muelu_label_to_project.yml b/.github/workflows/tpetra_muelu_label_to_project.yml index 47ec3a77ebf3..b2baa62ca4f5 100644 --- a/.github/workflows/tpetra_muelu_label_to_project.yml +++ b/.github/workflows/tpetra_muelu_label_to_project.yml @@ -2,7 +2,7 @@ name: Auto assign MueLu or Tpetra labeled or titled issues to MueLu or Tpetra Pr on: issues: - types: [opened, labeled] + types: [opened,labeled] env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -44,11 +44,11 @@ jobs: uses: srggrs/assign-one-project-github-action@1.3.0 if: contains(github.event.label.name, 'MueLu') || contains(github.event.issue.title, 'MueLu') with: - project: 'https://github.com/trilinos/Trilinos/projects/5' - column_name: 'Backlog' + project: 'https://github.com/muelu/Trilinos/projects/5' + column_name: 'Feature request' - name: Add to Tpetra Project uses: srggrs/assign-one-project-github-action@1.3.0 if: contains(github.event.label.name, 'Tpetra') || contains(github.event.issue.title, 'Tpetra') with: - project: 'https://github.com/trilinos/Trilinos/projects/2' - column_name: 'Needs Triage' + project: 'https://github.com/muelu/Trilinos/projects/2' + column_name: 'Backlog' diff --git a/packages/muelu/src/Graph/MueLu_AggregationAlgorithmBase.hpp b/packages/muelu/src/Graph/MueLu_AggregationAlgorithmBase.hpp index 3ab43d690931..94b8ccd07eb7 100644 --- a/packages/muelu/src/Graph/MueLu_AggregationAlgorithmBase.hpp +++ b/packages/muelu/src/Graph/MueLu_AggregationAlgorithmBase.hpp @@ -55,6 +55,7 @@ #include "MueLu_GraphBase.hpp" #include "MueLu_Types.hpp" + namespace MueLu { /*!