diff --git a/.github/workflows/post-sofa-dev-template.yml b/.github/workflows/post-sofa-dev-template.yml index 3c44b34..cb09dd3 100644 --- a/.github/workflows/post-sofa-dev-template.yml +++ b/.github/workflows/post-sofa-dev-template.yml @@ -30,7 +30,7 @@ jobs: - name: Run script SOFA-dev-meeting-template.py if: github.event.schedule != '0 0 15 * *' run: | - python SOFA-dev-meeting/SOFA-dev-meeting-template.py sofa SofaPython3 BeamAdapter doc ci SofaGLFW Regression Sofa.Qt SofaMJEDFEM CGALPlugin Registration PluginExample SofaSphFluid CSparseSolvers Sofa.Metis + python SOFA-dev-meeting/SOFA-dev-meeting-template.py sofa SofaPython3 BeamAdapter doc ci SofaGLFW Regression Sofa.Qt SofaMJEDFEM CGALPlugin Registration PluginExample SofaSphFluid CSparseSolvers Sofa.Metis SofaDefrost/Cosserat SofaDefrost/SoftRobots SofaDefrost/SoftRobots.Inverse SofaDefrost/ModelOrderReduction SofaDefrost/SofaViscoElastic SofaDefrost/SOFA.VTK working-directory: ${{ github.workspace }} env: DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_SOFADEV_WEBHOOK_URL }} diff --git a/SOFA-dev-meeting/SOFA-dev-meeting-template.py b/SOFA-dev-meeting/SOFA-dev-meeting-template.py index 0254b55..50985f2 100644 --- a/SOFA-dev-meeting/SOFA-dev-meeting-template.py +++ b/SOFA-dev-meeting/SOFA-dev-meeting-template.py @@ -25,18 +25,30 @@ def main(argv): message="# "+str(dateToday)+"\n### News\n- \n\n### Technical discussions\n" - output = list_topics_to_be_discussed("sofa") + output = list_topics_to_be_discussed("sofa-framework","sofa") message = message + output + "\n" message = message + "### PR review\n" for arg in argv[1:]: - output = list_to_review_pr(arg) - message = message + output +"\n" + repo_owner = "sofa-framework" + repo_name = arg + if "/" in arg: + repo_owner = arg.split("/")[0] + repo_name = arg.split("/")[1] + output = list_to_review_pr(repo_owner, repo_name) + if output != "": + message = message + output +"\n" message = message + "### PR merged within the week\n" for arg in argv[1:]: - output = list_merged_pr(arg) - message = message + output +"\n" + repo_owner = "sofa-framework" + repo_name = arg + if "/" in arg: + repo_owner = arg.split("/")[0] + repo_name = arg.split("/")[1] + output = list_merged_pr(repo_owner, repo_name) + if output != "": + message = message + output +"\n" message = message + "\n---\n" diff --git a/SOFA-dev-meeting/find_all_to_review_PR.py b/SOFA-dev-meeting/find_all_to_review_PR.py index d474c92..b17b159 100644 --- a/SOFA-dev-meeting/find_all_to_review_PR.py +++ b/SOFA-dev-meeting/find_all_to_review_PR.py @@ -1,9 +1,7 @@ from github import Github import os -def list_to_review_pr(repo_name): - # Example usage - repo_owner = "sofa-framework" +def list_to_review_pr(repo_owner, repo_name): if "GITHUB_TOKEN" in os.environ: github_token = os.environ['GITHUB_TOKEN'] else: diff --git a/SOFA-dev-meeting/list_merged_pr.py b/SOFA-dev-meeting/list_merged_pr.py index 398b38d..c3c0146 100644 --- a/SOFA-dev-meeting/list_merged_pr.py +++ b/SOFA-dev-meeting/list_merged_pr.py @@ -27,8 +27,7 @@ def get_merged_pull_requests(repo_owner, repo_name, token): return merged_pull_requests -def list_merged_pr(repo_name): - repo_owner = "sofa-framework" +def list_merged_pr(repo_owner, repo_name): if "GITHUB_TOKEN" in os.environ: github_token = os.environ['GITHUB_TOKEN'] else: diff --git a/SOFA-dev-meeting/list_topics_to_be_discussed.py b/SOFA-dev-meeting/list_topics_to_be_discussed.py index 6639e4a..8154d8a 100644 --- a/SOFA-dev-meeting/list_topics_to_be_discussed.py +++ b/SOFA-dev-meeting/list_topics_to_be_discussed.py @@ -1,9 +1,7 @@ from github import Github import os -def list_topics_to_be_discussed(repo_name): - # Example usage - repo_owner = "sofa-framework" +def list_topics_to_be_discussed(repo_owner, repo_name): if "GITHUB_TOKEN" in os.environ: github_token = os.environ['GITHUB_TOKEN'] else: