Skip to content

Commit 4c09738

Browse files
authored
Merge branch 'main' into jn/cancel-signal
2 parents 6764977 + 890b81c commit 4c09738

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

.kodiak.toml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# .kodiak.toml
2+
3+
version = 1
4+
merge.delete_branch_on_merge = true
5+
merge.prioritize_ready_to_merge=true
6+
merge.priority_merge_label="automerge_priority"
7+
merge.method="squash"

utilities/rr/rr_capture.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ mktempdir(temp_parent_dir) do dir
6464
# version number, Pkg will always install the latest build number. If you need to
6565
# install a build number that is not the latest build number, you must provide the
6666
# commit instead of providing the version number.
67-
Pkg.add(Pkg.PackageSpec(name = "rr_jll", version = "5.5.0", uuid = "e86bdf43-55f7-5ea2-9fd0-e7daa2c0f2b4"))
67+
Pkg.add(Pkg.PackageSpec(name = "rr_jll", version = "5.7.0", uuid = "e86bdf43-55f7-5ea2-9fd0-e7daa2c0f2b4"))
6868
Pkg.add(Pkg.PackageSpec(name = "Zstd_jll", version = "1.5.0", uuid = "3161d3a3-bdf6-5164-811a-617609db77b4"))
6969
rr_jll = Base.require(Base.PkgId(Base.UUID("e86bdf43-55f7-5ea2-9fd0-e7daa2c0f2b4"), "rr_jll"))
7070
zstd_jll = Base.require(Base.PkgId(Base.UUID("3161d3a3-bdf6-5164-811a-617609db77b4"), "Zstd_jll"))

0 commit comments

Comments
 (0)