From 4a6d7ef3a163caaa43f3c4108485ced6bec72cbc Mon Sep 17 00:00:00 2001 From: Daniel Possenriede Date: Tue, 17 Jan 2023 14:46:28 +0100 Subject: [PATCH 1/7] commit all styled files --- examples/style.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/style.yaml b/examples/style.yaml index 771ef8e68..3ac5d7bf8 100644 --- a/examples/style.yaml +++ b/examples/style.yaml @@ -62,7 +62,7 @@ jobs: run: | git config --local user.name "$GITHUB_ACTOR" git config --local user.email "$GITHUB_ACTOR@users.noreply.github.com" - git add R/\* + git add \*.[rR] \*.[qrR]md \*.[rR]markdown \*.[rR]nw \*.[rR]profile git commit -m "Style code" || echo "No changes to commit" git pull --ff-only git push origin From 11ae0e5ab07b1312fa71ba39715d203fc7d68d06 Mon Sep 17 00:00:00 2001 From: Daniel Possenriede Date: Tue, 17 Jan 2023 14:46:57 +0100 Subject: [PATCH 2/7] style all supported filetypes --- examples/style.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/style.yaml b/examples/style.yaml index 3ac5d7bf8..9896234ad 100644 --- a/examples/style.yaml +++ b/examples/style.yaml @@ -55,7 +55,7 @@ jobs: ${{ runner.os }}- - name: Style - run: styler::style_pkg(filetype = c(".R", ".Rmd", ".Rmarkdown", ".Rnw")) + run: styler::style_pkg() shell: Rscript {0} - name: Commit and push changes From 40d5060ff0f4e3b275d36673c0fa7b45e86cf919 Mon Sep 17 00:00:00 2001 From: Daniel Possenriede Date: Tue, 17 Jan 2023 14:47:32 +0100 Subject: [PATCH 3/7] trigger action also on changes to Rprofile --- examples/style.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/style.yaml b/examples/style.yaml index 9896234ad..1b8dcc368 100644 --- a/examples/style.yaml +++ b/examples/style.yaml @@ -2,7 +2,7 @@ # Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help on: push: - paths: ["**.[rR]", "**.[qrR]md", "**.[rR]markdown", "**.[rR]nw"] + paths: ["**.[rR]", "**.[qrR]md", "**.[rR]markdown", "**.[rR]nw", , "**.[rR]profile"] name: Style From 1e3fed0ff16947e0091da87da14bbaf09f2bf271 Mon Sep 17 00:00:00 2001 From: Daniel Possenriede Date: Tue, 17 Jan 2023 15:04:33 +0100 Subject: [PATCH 4/7] update README.md --- examples/README.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/examples/README.md b/examples/README.md index 6b742b218..db9c5173f 100644 --- a/examples/README.md +++ b/examples/README.md @@ -622,9 +622,7 @@ changes to the same branch. # Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help on: push: - paths: ["**.[rR]", "**.[qrR]md", "**.[rR]markdown", "**.[rR]nw"] - pull_request: - paths: ["**.[rR]", "**.[qrR]md", "**.[rR]markdown", "**.[rR]nw"] + paths: ["**.[rR]", "**.[qrR]md", "**.[rR]markdown", "**.[rR]nw", , "**.[rR]profile"] name: Style @@ -677,14 +675,14 @@ jobs: ${{ runner.os }}- - name: Style - run: styler::style_pkg(filetype = c(".R", ".Rmd", ".Rmarkdown", ".Rnw")) + run: styler::style_pkg() shell: Rscript {0} - name: Commit and push changes run: | git config --local user.name "$GITHUB_ACTOR" git config --local user.email "$GITHUB_ACTOR@users.noreply.github.com" - git add R/\* + git add \*.[rR] \*.[qrR]md \*.[rR]markdown \*.[rR]nw \*.[rR]profile git commit -m "Style code" || echo "No changes to commit" git pull --ff-only git push origin From 9060b195e48f0a0e93296fd3bf771eccabdd955b Mon Sep 17 00:00:00 2001 From: Daniel Possenriede Date: Thu, 19 Jan 2023 19:55:44 +0100 Subject: [PATCH 5/7] typo --- examples/README.md | 2 +- examples/style.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/README.md b/examples/README.md index db9c5173f..6936201e6 100644 --- a/examples/README.md +++ b/examples/README.md @@ -622,7 +622,7 @@ changes to the same branch. # Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help on: push: - paths: ["**.[rR]", "**.[qrR]md", "**.[rR]markdown", "**.[rR]nw", , "**.[rR]profile"] + paths: ["**.[rR]", "**.[qrR]md", "**.[rR]markdown", "**.[rR]nw", "**.[rR]profile"] name: Style diff --git a/examples/style.yaml b/examples/style.yaml index 1b8dcc368..afe3cc4c1 100644 --- a/examples/style.yaml +++ b/examples/style.yaml @@ -2,7 +2,7 @@ # Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help on: push: - paths: ["**.[rR]", "**.[qrR]md", "**.[rR]markdown", "**.[rR]nw", , "**.[rR]profile"] + paths: ["**.[rR]", "**.[qrR]md", "**.[rR]markdown", "**.[rR]nw", "**.[rR]profile"] name: Style From 594274edc6a2a78a85ef9ddd63ca9efa41b0676f Mon Sep 17 00:00:00 2001 From: Daniel Possenriede Date: Tue, 4 Apr 2023 16:22:28 +0200 Subject: [PATCH 6/7] commit styler-changed files, exit with message if no changes to commit --- examples/style.yaml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/examples/style.yaml b/examples/style.yaml index afe3cc4c1..bee3e482a 100644 --- a/examples/style.yaml +++ b/examples/style.yaml @@ -60,9 +60,14 @@ jobs: - name: Commit and push changes run: | - git config --local user.name "$GITHUB_ACTOR" - git config --local user.email "$GITHUB_ACTOR@users.noreply.github.com" - git add \*.[rR] \*.[qrR]md \*.[rR]markdown \*.[rR]nw \*.[rR]profile - git commit -m "Style code" || echo "No changes to commit" - git pull --ff-only - git push origin + if FILES_TO_COMMIT=($(git diff-index --name-only ${{ github.sha }} \ + | egrep --ignore-case '\.(R|[qR]md|Rmarkdown|Rnw|Rprofile)$')) + then + git config --local user.name "$GITHUB_ACTOR" + git config --local user.email "$GITHUB_ACTOR@users.noreply.github.com" + git commit ${FILES_TO_COMMIT[*]} -m "Style code (GHA)" + git pull --ff-only + git push origin + else + echo "No changes to commit." + fi From cb06414788495aad8a16935bdf92819db2c5f47f Mon Sep 17 00:00:00 2001 From: Daniel Possenriede Date: Tue, 4 Apr 2023 16:33:34 +0200 Subject: [PATCH 7/7] update README.md --- examples/README.md | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/examples/README.md b/examples/README.md index 5a4703ac4..05baffb5c 100644 --- a/examples/README.md +++ b/examples/README.md @@ -678,12 +678,17 @@ jobs: - name: Commit and push changes run: | - git config --local user.name "$GITHUB_ACTOR" - git config --local user.email "$GITHUB_ACTOR@users.noreply.github.com" - git add \*.[rR] \*.[qrR]md \*.[rR]markdown \*.[rR]nw \*.[rR]profile - git commit -m "Style code" || echo "No changes to commit" - git pull --ff-only - git push origin + if FILES_TO_COMMIT=($(git diff-index --name-only ${{ github.sha }} \ + | egrep --ignore-case '\.(R|[qR]md|Rmarkdown|Rnw|Rprofile)$')) + then + git config --local user.name "$GITHUB_ACTOR" + git config --local user.email "$GITHUB_ACTOR@users.noreply.github.com" + git commit ${FILES_TO_COMMIT[*]} -m "Style code (GHA)" + git pull --ff-only + git push origin + else + echo "No changes to commit." + fi ``` ## Build bookdown site