Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update MueLu_AggregationAlgorithmBase.hpp #59

Open
wants to merge 44 commits into
base: muelu-sync-workflow
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
5da8c80
Set up MueLu sync workflow
cgcgcg Jan 11, 2022
1492566
Merge pull request #23 from trilinos/develop
csiefer2 Feb 2, 2022
0b51c89
Create tpetra_muelu_label_to_project.yml
csiefer2 Feb 2, 2022
26cc4ca
Update tpetra_muelu_label_to_project.yml
csiefer2 Feb 2, 2022
a28b1ab
Update tpetra_muelu_label_to_project.yml
csiefer2 Feb 2, 2022
8263691
Update muelu-sync.yml
csiefer2 Feb 2, 2022
4973c19
Update muelu-sync.yml
csiefer2 Sep 13, 2023
365f8ac
Update muelu-sync.yml
csiefer2 Sep 19, 2023
81ca88b
Merge branch 'master' into muelu-sync-workflow
csiefer2 Jan 2, 2024
adcb6ec
Update muelu_clang_format.yml
csiefer2 Jan 2, 2024
673af1d
Update muelu_clang_format.yml
csiefer2 Jan 2, 2024
c2e8f52
Update muelu_clang_format.yml
csiefer2 Jan 2, 2024
bd11e59
Update muelu_clang_format.yml
csiefer2 Jan 2, 2024
a36cf8c
Update muelu_clang_format.yml
csiefer2 Jan 2, 2024
5dd96b2
Update muelu_clang_format.yml
csiefer2 Jan 2, 2024
12519d2
Update muelu_clang_format.yml
csiefer2 Jan 2, 2024
734fc03
Update muelu_clang_format.yml
csiefer2 Jan 2, 2024
3382f41
Update muelu_clang_format.yml
csiefer2 Jan 2, 2024
d83072a
Update muelu_clang_format.yml
csiefer2 Jan 2, 2024
8798f86
Update muelu_clang_format.yml
csiefer2 Jan 2, 2024
7acc5cf
Update muelu_clang_format.yml
csiefer2 Jan 2, 2024
b9bd519
Update muelu_clang_format.yml
csiefer2 Jan 2, 2024
056226a
Update muelu_clang_format.yml
csiefer2 Jan 2, 2024
f7d81ad
Update muelu_clang_format.yml
csiefer2 Jan 2, 2024
c6444e9
Update muelu_clang_format.yml
csiefer2 Jan 2, 2024
2386d4f
Update muelu_clang_format.yml
csiefer2 Jan 2, 2024
995e5d0
Update muelu_clang_format.yml
csiefer2 Jan 2, 2024
a5f0ce2
Update muelu_clang_format.yml
csiefer2 Jan 2, 2024
d9aee83
Update muelu_clang_format.yml
csiefer2 Jan 2, 2024
bae56b0
Update muelu_clang_format.yml
csiefer2 Jan 2, 2024
5a111f3
Update muelu_clang_format.yml
csiefer2 Jan 2, 2024
40cb0f8
Update muelu_clang_format.yml
csiefer2 Jan 2, 2024
e0122d6
Update muelu_clang_format.yml
csiefer2 Jan 2, 2024
e74e1f9
Update muelu_clang_format.yml
csiefer2 Jan 2, 2024
6c88b0e
Update muelu_clang_format.yml
csiefer2 Jan 2, 2024
9addc34
Update muelu_clang_format.yml
csiefer2 Jan 2, 2024
8d9f6c4
Update muelu_clang_format.yml
csiefer2 Jan 2, 2024
33002c0
Update muelu_clang_format.yml
csiefer2 Jan 2, 2024
40f7ff6
Update muelu_clang_format.yml
csiefer2 Jan 2, 2024
eb738a6
Update muelu_clang_format.yml
csiefer2 Jan 2, 2024
f85e241
Update muelu_clang_format.yml
csiefer2 Jan 2, 2024
5ba48a1
Update muelu_clang_format.yml
csiefer2 Jan 2, 2024
ff1ca05
Update MueLu_AggregationAlgorithmBase.hpp
csiefer2 Jan 2, 2024
96b5d70
Update MueLu_AggregationAlgorithmBase.hpp
csiefer2 Apr 8, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions .github/workflows/muelu-sync.yml
Original file line number Diff line number Diff line change
@@ -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/[email protected]
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/[email protected]
with:
source_repo: https://github.com/trilinos/Trilinos.git
source_branch: develop
destination_branch: develop
github_token: ${{ secrets.MUELU_SYNC_TOKEN }}
17 changes: 16 additions & 1 deletion .github/workflows/muelu_clang_format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
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:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/tpetra_muelu_label_to_project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -44,11 +44,11 @@ jobs:
uses: srggrs/[email protected]
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/[email protected]
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'
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
#include "MueLu_GraphBase.hpp"
#include "MueLu_Types.hpp"


namespace MueLu {

/*!
Expand Down
Loading