Merge 'master' into release

Author: glandium

.github/workflows/cargo-package.yml

@@ -18,10 +18,10 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest]
-        toolchain: [1.85.0]
+        toolchain: [1.85.1]
         include:
           - os: windows-latest
-            toolchain: 1.85.0-x86_64-pc-windows-gnu
+            toolchain: 1.85.1-x86_64-pc-windows-gnu
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4

.github/workflows/rust.yml

@@ -6,10 +6,10 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, ubuntu-24.04-arm, macos-latest]
-        toolchain: [1.85.0]
+        toolchain: [1.85.1]
         include:
           - os: windows-latest
-            toolchain: 1.85.0-x86_64-pc-windows-gnu
+            toolchain: 1.85.1-x86_64-pc-windows-gnu
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
@@ -59,7 +59,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: 1.85.0
+          toolchain: 1.85.1
           components: rustfmt
       - run: cargo fmt -- --check
 
@@ -68,10 +68,10 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest]
-        toolchain: [1.85.0, 1.75.0]
+        toolchain: [1.85.1, 1.75.0]
         include:
           - os: windows-latest
-            toolchain: 1.85.0-x86_64-pc-windows-gnu
+            toolchain: 1.85.1-x86_64-pc-windows-gnu
           - os: windows-latest
             toolchain: 1.75.0-x86_64-pc-windows-gnu
     runs-on: ${{ matrix.os }}

CI/test_download.py

@@ -33,11 +33,12 @@
     "0.6.3": "0.6.3",
     "0.7.0beta1": "0.7.0-beta.1",
     "0.7.0beta2": "0.7.0-beta.2",
+    "0.7.0": "0.7.0",
+    "0.7.1": "0.7.1",
     # Newer versions below. We're bound to what older versions were doing to find the
     # right download on self-update. I don't know what went through my head when I
     # made that code strip dashes from tag names...
-    "0.7.0": "0.7.0",
-    "0.7.1": "0.7.1",
+    "0.7.2": "0.7.2",
     # Here's a trick to make things happy-ish in the future: older versions don't
     # handle tags prefixed with "v", but will still do a self-update to the first
     # one it finds.

CI/tools.py

@@ -16,7 +16,7 @@
 from util import build_commit
 
 MERCURIAL_VERSION = "6.9.1"
-GIT_VERSION = "2.48.1"
+GIT_VERSION = "2.49.0"
 
 ALL_MERCURIAL_VERSIONS = (
     "1.9.3",
@@ -334,7 +334,7 @@ def install(self):
         return ["{} -m pip install --force-reinstall {}".format(python, filename)]
 
 
-def install_rust(version="1.85.0", target="x86_64-unknown-linux-gnu"):
+def install_rust(version="1.85.1", target="x86_64-unknown-linux-gnu"):
     rustup_opts = "-y --default-toolchain none"
     cargo_dir = "$HOME/.cargo/bin/"
     rustup = cargo_dir + "rustup"