Merge branch 'main' into jn/cancel-signal

JuliaCI · Aug 19, 2024 · 4c09738 · 4c09738
2 parents 6764977 + 890b81c
commit 4c09738
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/.kodiak.toml b/.kodiak.toml
@@ -0,0 +1,7 @@
+# .kodiak.toml
+
+version = 1
+merge.delete_branch_on_merge = true
+merge.prioritize_ready_to_merge=true
+merge.priority_merge_label="automerge_priority"
+merge.method="squash"
diff --git a/utilities/rr/rr_capture.jl b/utilities/rr/rr_capture.jl
@@ -64,7 +64,7 @@ mktempdir(temp_parent_dir) do dir
     # version number, Pkg will always install the latest build number. If you need to
     # install a build number that is not the latest build number, you must provide the
     # commit instead of providing the version number.
-    Pkg.add(Pkg.PackageSpec(name = "rr_jll", version = "5.5.0", uuid = "e86bdf43-55f7-5ea2-9fd0-e7daa2c0f2b4"))
+    Pkg.add(Pkg.PackageSpec(name = "rr_jll", version = "5.7.0", uuid = "e86bdf43-55f7-5ea2-9fd0-e7daa2c0f2b4"))
     Pkg.add(Pkg.PackageSpec(name = "Zstd_jll", version = "1.5.0", uuid = "3161d3a3-bdf6-5164-811a-617609db77b4"))
     rr_jll = Base.require(Base.PkgId(Base.UUID("e86bdf43-55f7-5ea2-9fd0-e7daa2c0f2b4"), "rr_jll"))
     zstd_jll = Base.require(Base.PkgId(Base.UUID("3161d3a3-bdf6-5164-811a-617609db77b4"), "Zstd_jll"))