From 16ca317c00386223c7d18959b261e7b80dd1a1a8 Mon Sep 17 00:00:00 2001 From: "Faruk D." Date: Wed, 21 Aug 2024 16:45:37 +0200 Subject: [PATCH 1/4] next_steps_citation workflow cleans up the artifacts --- .../{% if AddCitation %}next_steps_citation.yml{% endif %} | 4 ++-- ...dCitation %}next_steps_citation_issue.md{% endif %}.jinja} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename template/.github/{next_steps/{% if AddCitation %}02_citation.md{% endif %}.jinja => workflows/{% if AddCitation %}next_steps_citation_issue.md{% endif %}.jinja} (100%) diff --git a/template/.github/workflows/{% if AddCitation %}next_steps_citation.yml{% endif %} b/template/.github/workflows/{% if AddCitation %}next_steps_citation.yml{% endif %} index 48269288..17c28abe 100644 --- a/template/.github/workflows/{% if AddCitation %}next_steps_citation.yml{% endif %} +++ b/template/.github/workflows/{% if AddCitation %}next_steps_citation.yml{% endif %} @@ -13,7 +13,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - filename: .github/next_steps/02_citation.md + filename: .github/workflows/next_steps_citation_issue.md id: citation - name: List created issues run: | @@ -24,6 +24,6 @@ jobs: git config --global user.name 'NLeSC Python template' git config --global user.email 'nlesc-python-template@users.noreply.github.com' git rm .github/workflows/next_steps_citation.yml - git rm -r .github/next_steps + git rm .github/workflows/next_steps_citation_issue.md git commit -am "Cleanup automated next steps issue generator" git push diff --git a/template/.github/next_steps/{% if AddCitation %}02_citation.md{% endif %}.jinja b/template/.github/workflows/{% if AddCitation %}next_steps_citation_issue.md{% endif %}.jinja similarity index 100% rename from template/.github/next_steps/{% if AddCitation %}02_citation.md{% endif %}.jinja rename to template/.github/workflows/{% if AddCitation %}next_steps_citation_issue.md{% endif %}.jinja From f79b6615c1a2916897933c1f34c48d66afb5ef16 Mon Sep 17 00:00:00 2001 From: "Faruk D." Date: Wed, 21 Aug 2024 16:45:57 +0200 Subject: [PATCH 2/4] next_steps_citation workflow cleans up the artifacts --- .../{% if AddCitation %}next_steps_citation.yml{% endif %} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/.github/workflows/{% if AddCitation %}next_steps_citation.yml{% endif %} b/template/.github/workflows/{% if AddCitation %}next_steps_citation.yml{% endif %} index 17c28abe..28f369b5 100644 --- a/template/.github/workflows/{% if AddCitation %}next_steps_citation.yml{% endif %} +++ b/template/.github/workflows/{% if AddCitation %}next_steps_citation.yml{% endif %} @@ -25,5 +25,5 @@ jobs: git config --global user.email 'nlesc-python-template@users.noreply.github.com' git rm .github/workflows/next_steps_citation.yml git rm .github/workflows/next_steps_citation_issue.md - git commit -am "Cleanup automated next steps issue generator" + git commit -am "Cleanup automated next steps issue generator for citation" git push From 8064e90107dd6a5aaccbc34b52db31bb83ecbdb7 Mon Sep 17 00:00:00 2001 From: "Faruk D." Date: Wed, 21 Aug 2024 16:51:02 +0200 Subject: [PATCH 3/4] next_steps_online_documentation workflow cleans up the artifacts --- ...ation %}next_steps_online_documentation.yml{% endif %} | 8 ++++---- ..._steps_online_documentation_issue.md{% endif %}.jinja} | 0 2 files changed, 4 insertions(+), 4 deletions(-) rename template/.github/{next_steps/{% if AddOnlineDocumentation %}03_readthedocs.md{% endif %}.jinja => workflows/{% if AddOnlineDocumentation %}next_steps_online_documentation_issue.md{% endif %}.jinja} (100%) diff --git a/template/.github/workflows/{% if AddOnlineDocumentation %}next_steps_online_documentation.yml{% endif %} b/template/.github/workflows/{% if AddOnlineDocumentation %}next_steps_online_documentation.yml{% endif %} index 1bc71b38..8aa9452a 100644 --- a/template/.github/workflows/{% if AddOnlineDocumentation %}next_steps_online_documentation.yml{% endif %} +++ b/template/.github/workflows/{% if AddOnlineDocumentation %}next_steps_online_documentation.yml{% endif %} @@ -8,12 +8,12 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Create readthedocs issue + - name: Create online documentation issue uses: JasonEtco/create-an-issue@v2 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - filename: .github/next_steps/03_readthedocs.md + filename: .github/workflows/next_steps_online_documentation_issue.md id: readthedocs - name: List created issues run: | @@ -24,6 +24,6 @@ jobs: git config --global user.name 'NLeSC Python template' git config --global user.email 'nlesc-python-template@users.noreply.github.com' git rm .github/workflows/next_steps_online_documentation.yml - git rm -r .github/next_steps - git commit -am "Cleanup automated next steps issue generator" + git rm .github/workflows/next_steps_online_documentation_issue.md + git commit -am "Cleanup automated next steps issue generator for online documentation" git push diff --git a/template/.github/next_steps/{% if AddOnlineDocumentation %}03_readthedocs.md{% endif %}.jinja b/template/.github/workflows/{% if AddOnlineDocumentation %}next_steps_online_documentation_issue.md{% endif %}.jinja similarity index 100% rename from template/.github/next_steps/{% if AddOnlineDocumentation %}03_readthedocs.md{% endif %}.jinja rename to template/.github/workflows/{% if AddOnlineDocumentation %}next_steps_online_documentation_issue.md{% endif %}.jinja From 8e560eed34adbf7b55486e52ffd784b556d083e5 Mon Sep 17 00:00:00 2001 From: "Faruk D." Date: Thu, 22 Aug 2024 14:44:58 +0200 Subject: [PATCH 4/4] pull the changes in next step workflow before updating the branch again --- .../{% if AddCitation %}next_steps_citation.yml{% endif %} | 1 + ...ocumentation %}next_steps_online_documentation.yml{% endif %} | 1 + 2 files changed, 2 insertions(+) diff --git a/template/.github/workflows/{% if AddCitation %}next_steps_citation.yml{% endif %} b/template/.github/workflows/{% if AddCitation %}next_steps_citation.yml{% endif %} index 28f369b5..bd6c1f00 100644 --- a/template/.github/workflows/{% if AddCitation %}next_steps_citation.yml{% endif %} +++ b/template/.github/workflows/{% if AddCitation %}next_steps_citation.yml{% endif %} @@ -23,6 +23,7 @@ jobs: run: | git config --global user.name 'NLeSC Python template' git config --global user.email 'nlesc-python-template@users.noreply.github.com' + git pull # other next step workflows may push changes before git rm .github/workflows/next_steps_citation.yml git rm .github/workflows/next_steps_citation_issue.md git commit -am "Cleanup automated next steps issue generator for citation" diff --git a/template/.github/workflows/{% if AddOnlineDocumentation %}next_steps_online_documentation.yml{% endif %} b/template/.github/workflows/{% if AddOnlineDocumentation %}next_steps_online_documentation.yml{% endif %} index 8aa9452a..c9f29e84 100644 --- a/template/.github/workflows/{% if AddOnlineDocumentation %}next_steps_online_documentation.yml{% endif %} +++ b/template/.github/workflows/{% if AddOnlineDocumentation %}next_steps_online_documentation.yml{% endif %} @@ -23,6 +23,7 @@ jobs: run: | git config --global user.name 'NLeSC Python template' git config --global user.email 'nlesc-python-template@users.noreply.github.com' + git pull # other next step workflows may push changes before git rm .github/workflows/next_steps_online_documentation.yml git rm .github/workflows/next_steps_online_documentation_issue.md git commit -am "Cleanup automated next steps issue generator for online documentation"