Skip to content

Commit

Permalink
Display and check if julia & stdlib versions match (#80)
Browse files Browse the repository at this point in the history
  • Loading branch information
IanButterworth authored Jan 2, 2023
1 parent 7f882f6 commit b6418bc
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 4 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
arch:
- x64
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: julia-actions/setup-julia@v1
with:
version: ${{ matrix.version }}
Expand All @@ -51,17 +51,17 @@ jobs:
- uses: julia-actions/julia-buildpkg@v1
- uses: julia-actions/julia-runtest@v1
env:
JULIA_DEBUG: 'all'
JULIA_DEBUG: 'BumpStdlibs'
BUMPSTDLIBS_TOKEN_FOR_TESTS: ${{ secrets.BUMPSTDLIBS_TOKEN_FOR_TESTS }}
- uses: julia-actions/julia-processcoverage@v1
- uses: codecov/codecov-action@v1
- uses: codecov/codecov-action@v3
with:
file: lcov.info
docs:
name: Documentation
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: julia-actions/setup-julia@v1
with:
version: '1'
Expand Down
1 change: 1 addition & 0 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Downloads = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
GitHub = "bc5e4493-9b4d-5f90-b8aa-2b2bcaad7a26"
HTTP = "cd3eb016-35fb-5094-929b-558a96fad6f3"
JSON3 = "0f8b85d8-7281-11e9-16c2-39a750bddbf1"
TOML = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
TimeZones = "f269a46b-ccf7-5d73-abea-4c690281aa53"
URIs = "5c2747f8-b7ea-4ff2-ba2e-563bfd36b1d4"

Expand Down
1 change: 1 addition & 0 deletions src/BumpStdlibs.jl
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import GitHub
import HTTP
import JSON3
import TimeZones
import TOML
import URIs

export StdlibInfo
Expand Down
15 changes: 15 additions & 0 deletions src/bump-stdlibs.jl
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,16 @@ function _bump_single_stdlib(stdlib::StdlibInfo, config::Config, state::State)
stdlib_current_commit_in_upstream_short = strip(read(`git rev-parse --short $(stdlib_current_commit_in_upstream)`, String))
assert_string_startswith(stdlib_current_commit_in_upstream, stdlib_current_commit_in_upstream_short)
run(`git fetch --all --prune`)
stdlib_version = if isfile("Project.toml")
proj = TOML.parsefile("Project.toml")
if haskey(proj, "version")
VersionNumber(proj["version"])
else
"$(stdlib.name) Project.toml has no version entry!"
end
else
"No Project.toml found in $(stdlib.name) repo!"
end
changelog_cmd = `git log --oneline $(stdlib_current_commit_in_upstream_short)..$(stdlib_latest_commit_short)`
changelog = read(changelog_cmd, String)
if stdlib_latest_commit == stdlib_current_commit_in_upstream
Expand All @@ -130,12 +140,16 @@ function _bump_single_stdlib(stdlib::StdlibInfo, config::Config, state::State)
git_url_markdown = _git_url_to_formatted_markdown(stdlib.git_url)
bumpstdlibs_sender = strip(get(ENV, "BUMPSTDLIBS_SENDER", ""))
bumpstdlibs_sender_ping = isempty(bumpstdlibs_sender) ? "unknown user" : "@$(bumpstdlibs_sender)"
julia_version = Base.VersionNumber(read("VERSION", String))
version_match = stdlib_version isa VersionNumber && Base.thispatch(julia_version) === Base.thispatch(stdlib_version)
pr_body_lines = String[
"Stdlib: $(stdlib.name)",
"URL: $(git_url_markdown)",
"Branch: $(stdlib.branch)",
"Old commit: $(stdlib_current_commit_in_upstream_short)",
"New commit: $(stdlib_latest_commit_short)",
"Julia version: $(repr(julia_version))",
"$(stdlib.name) version: $(repr(stdlib_version))$(version_match ? "" : " (Does not match)")",
"Bump invoked by: $(bumpstdlibs_sender_ping)",
"Powered by: [BumpStdlibs.jl](https://github.com/JuliaLang/BumpStdlibs.jl)",
"",
Expand Down Expand Up @@ -229,6 +243,7 @@ function _bump_single_stdlib(stdlib::StdlibInfo, config::Config, state::State)
"maintainer_can_modify" => true,
"title" => pr_title,
)
@debug "" pr_body
@debug "" upstream_julia_repo_gh.full_name
@debug "" fork_julia_repo_gh.full_name
@debug "" pr_state
Expand Down

0 comments on commit b6418bc

Please sign in to comment.