From 24e8dd946dc1c1a8ebc200656385965a14dc1e96 Mon Sep 17 00:00:00 2001 From: Dilum Aluthge Date: Thu, 3 Dec 2020 00:56:44 +0000 Subject: [PATCH 1/3] Print the changelog more compactly --- src/bump-stdlibs.jl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/bump-stdlibs.jl b/src/bump-stdlibs.jl index 0a6746b..1460499 100644 --- a/src/bump-stdlibs.jl +++ b/src/bump-stdlibs.jl @@ -86,7 +86,8 @@ function _bump_single_stdlib(stdlib::StdlibInfo; cd(temp_dir) cd("STDLIB") run(`git fetch --all --prune`) - changelog = read(`git log --pretty=oneline --abbrev=commit $(stdlib_current_commit_in_upstream)^..$(stdlib_latest_commit)`, String) + changelog_cmd = `git log --oneline $(stdlib_current_commit_in_upstream)^..$(stdlib_latest_commit)` + changelog = read(changelog_cmd, String) cd(temp_dir) cd("FORK") run(`git checkout $(upstream_julia_repo_default_branch)`) @@ -98,7 +99,7 @@ function _bump_single_stdlib(stdlib::StdlibInfo; "This pull request bumps Pkg to `$(stdlib_latest_commit_short)`, which is currently the latest commit on the `$(stdlib.branch)` branch.\n", "\n", "```\n", - "\$ git log --pretty=oneline --abbrev=commit $(stdlib_current_commit_in_upstream)^..$(stdlib_latest_commit)\n", + "\$ $(string(changelog_cmd))\n", "$(strip(changelog))\n", "```\n", ) From 43136be2040f8193ddab03ffac389866bc3f21f2 Mon Sep 17 00:00:00 2001 From: Dilum Aluthge Date: Thu, 3 Dec 2020 01:05:15 +0000 Subject: [PATCH 2/3] Update bump-stdlibs.jl --- src/bump-stdlibs.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bump-stdlibs.jl b/src/bump-stdlibs.jl index 1460499..603f264 100644 --- a/src/bump-stdlibs.jl +++ b/src/bump-stdlibs.jl @@ -99,7 +99,7 @@ function _bump_single_stdlib(stdlib::StdlibInfo; "This pull request bumps Pkg to `$(stdlib_latest_commit_short)`, which is currently the latest commit on the `$(stdlib.branch)` branch.\n", "\n", "```\n", - "\$ $(string(changelog_cmd))\n", + "\$ $(strip(string(changelog_cmd), '`'))\n", "$(strip(changelog))\n", "```\n", ) From 9e40fbe5c864e03b0e88d1550306486655f888c1 Mon Sep 17 00:00:00 2001 From: Dilum Aluthge Date: Thu, 3 Dec 2020 01:12:25 +0000 Subject: [PATCH 3/3] Update bump-stdlibs.jl --- src/bump-stdlibs.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bump-stdlibs.jl b/src/bump-stdlibs.jl index 603f264..71c1473 100644 --- a/src/bump-stdlibs.jl +++ b/src/bump-stdlibs.jl @@ -96,7 +96,7 @@ function _bump_single_stdlib(stdlib::StdlibInfo; commit_message = "🤖 Bump the $(name) stdlib to $(stdlib_latest_commit_short)" pr_branch = "BumpStdlibs/$(name)-$(stdlib_latest_commit_short)$(pr_branch_suffix)" pr_body = string( - "This pull request bumps Pkg to `$(stdlib_latest_commit_short)`, which is currently the latest commit on the `$(stdlib.branch)` branch.\n", + "This pull request bumps $(name) to `$(stdlib_latest_commit_short)`, which is currently the latest commit on the `$(stdlib.branch)` branch.\n", "\n", "```\n", "\$ $(strip(string(changelog_cmd), '`'))\n",