Merge branch '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.1]
+        toolchain: [1.88.0]
         include:
           - os: windows-latest
-            toolchain: 1.85.1-x86_64-pc-windows-gnu
+            toolchain: 1.88.0-x86_64-pc-windows-gnu
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
@@ -32,7 +32,7 @@ jobs:
           toolchain: ${{ matrix.toolchain }}
       - uses: msys2/setup-msys2@v2
         with:
-          release: false
+          release: true
           update: false
           msystem: MINGW64
           install: >-

.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.1]
+        toolchain: [1.88.0]
         include:
           - os: windows-latest
-            toolchain: 1.85.1-x86_64-pc-windows-gnu
+            toolchain: 1.88.0-x86_64-pc-windows-gnu
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
@@ -28,7 +28,7 @@ jobs:
           components: clippy
       - uses: msys2/setup-msys2@v2
         with:
-          release: false
+          release: true
           update: false
           msystem: MINGW64
           install: >-
@@ -59,7 +59,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: 1.85.1
+          toolchain: 1.88.0
           components: rustfmt
       - run: cargo fmt -- --check
 
@@ -68,10 +68,10 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest]
-        toolchain: [1.85.1, 1.75.0]
+        toolchain: [1.88.0, 1.75.0]
         include:
           - os: windows-latest
-            toolchain: 1.85.1-x86_64-pc-windows-gnu
+            toolchain: 1.88.0-x86_64-pc-windows-gnu
           - os: windows-latest
             toolchain: 1.75.0-x86_64-pc-windows-gnu
     runs-on: ${{ matrix.os }}
@@ -91,7 +91,7 @@ jobs:
           toolchain: ${{ matrix.toolchain }}
       - uses: msys2/setup-msys2@v2
         with:
-          release: false
+          release: true
           update: false
           msystem: MINGW64
           install: >-

.taskcluster.yml

@@ -5,8 +5,8 @@ tasks:
     $let:
       e:
         repo_name: ${event.repository.name}
-        repo_url: ${event.repository.url}
-        base_repo_url: ${event.repository.url}
+        repo_url: ${event.repository.html_url}
+        base_repo_url: ${event.repository.html_url}
         login: ${event.pusher.name}
         commit: ${event.after}
         branch:
@@ -94,7 +94,7 @@ tasks:
                     git -C repo remote add head ${e.repo_url} &&
                     git -C repo remote update head &&
                     git -c advice.detachedHead=false -C repo checkout ${e.commit} &&
-                    python3 repo/CI/get_artifact.py --run-id $(cat run_id) index.project.git-cinnabar.build.${e.commit}.${variant}
+                    python3 repo/CI/get_artifact.py --run-id $(cat run_id) index.project.git-cinnabar.build.${variant}.${e.commit}
               artifacts:
                 $if: '"windows" in variant'
                 then:

CI/docker.py

@@ -32,7 +32,7 @@ def sources_list(snapshot, sections):
 LLVM_REPO = (
     "echo"
     " deb [signed-by=/usr/share/keyrings/llvm.gpg]"
-    " https://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-19 main"
+    " https://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-20 main"
     " > /etc/apt/sources.list.d/llvm.list"
 )
 
@@ -96,9 +96,9 @@ def sources_list(snapshot, sections):
             "apt-get install -y --no-install-recommends {}".format(
                 " ".join(
                     [
-                        "clang-19",
-                        "lld-19",
-                        "llvm-19",
+                        "clang-20",
+                        "lld-20",
+                        "llvm-20",
                         "git",
                         "make",
                         "patch",
@@ -179,14 +179,14 @@ def sources_list(snapshot, sections):
             "apt-get install -y --no-install-recommends {}".format(
                 " ".join(
                     [
-                        "llvm-19",
+                        "llvm-20",
                         "make",
                     ]
                 )
             ),
             "apt-get clean",
             "pip3 install cram==0.7",
-            "ln -s llvm-symbolizer-19 /usr/bin/llvm-symbolizer",
+            "ln -s llvm-symbolizer-20 /usr/bin/llvm-symbolizer",
         ],
     },
 }

CI/test_download.py

@@ -35,10 +35,11 @@
     "0.7.0beta2": "0.7.0-beta.2",
     "0.7.0": "0.7.0",
     "0.7.1": "0.7.1",
+    "0.7.2": "0.7.2",
     # 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.2": "0.7.2",
+    "0.7.3": "0.7.3",
     # 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.
@@ -55,6 +56,20 @@
 VERSIONS_ORDER = {v: n for n, v in enumerate(VERSIONS)}
 
 
+def removesuffix(self, suffix):
+    if suffix and self.endswith(suffix):
+        return self[: -len(suffix)]
+    else:
+        return self[:]
+
+
+def removeprefix(self, prefix):
+    if self.startswith(prefix):
+        return self[len(prefix) :]
+    else:
+        return self[:]
+
+
 def version_for_tag(tag):
     if tag.startswith("v"):
         return tag[1:]
@@ -111,7 +126,7 @@ def get_pkg():
     worktree_head = env.check_output(["git", "-C", worktree, "rev-parse", "HEAD"])
     head_version = env.get_version([git_cinnabar, "-V"])
     head_full_version = env.get_version([git_cinnabar, "--version"])
-    _, _, head = head_full_version.removesuffix("-modified").rpartition("-")
+    _, _, head = removesuffix(head_full_version, "-modified").rpartition("-")
     head_branch = "release"
     if head_version.endswith(".0-a"):
         head_branch = "next"
@@ -472,7 +487,7 @@ def __init__(self, cwd, environ=os.environ):
     class CalledProcessError(subprocess.CalledProcessError):
         def __repr__(self):
             return (
-                super().__repr__().removesuffix(")")
+                removesuffix(super().__repr__(), ")")
                 + f", stdout={self.stdout!r}, stderr={self.stderr!r})"
             )
 
@@ -497,7 +512,7 @@ def subprocess_func(self, func, x, **kwargs):
         return result
 
     def get_version(self, x, **kwargs):
-        return self.check_output(x, **kwargs).removeprefix("git-cinnabar ")
+        return removeprefix(self.check_output(x, **kwargs), "git-cinnabar ")
 
     def derive_with(self, cwd=None, **kwargs):
         env = self.env.copy()

CI/tools.py

@@ -16,7 +16,7 @@
 from util import build_commit
 
 MERCURIAL_VERSION = "6.9.1"
-GIT_VERSION = "2.49.0"
+GIT_VERSION = "2.50.1"
 
 ALL_MERCURIAL_VERSIONS = (
     "1.9.3",
@@ -110,7 +110,7 @@ def __init__(self, os_and_version):
                 self,
                 task_env=build_image,
                 description=description,
-                index="{}.git.v{}".format(h.hexdigest(), version),
+                index="git.v{}.{}".format(version, h.hexdigest()),
                 command=Task.checkout(
                     "git://git.kernel.org/pub/scm/git/git.git",
                     "v{}".format(version),
@@ -150,7 +150,7 @@ def __init__(self, os_and_version):
                 self,
                 task_env=build_image,
                 description="git v{} {} {}".format(version, env.os, env.cpu),
-                index="{}.git.v{}".format(h.hexdigest(), raw_version),
+                index="git.v{}.{}".format(raw_version, h.hexdigest()),
                 command=[
                     "curl -L https://github.com/git-for-windows/git/releases/"
                     "download/v{}/MinGit-{}-{}-bit.zip"
@@ -315,7 +315,7 @@ def __init__(self, os_and_version):
             self,
             task_env=env,
             description=desc,
-            index="{}.hg.{}".format(h.hexdigest(), pretty_version),
+            index="hg.{}.{}".format(pretty_version, h.hexdigest()),
             command=pre_command
             + [f"{python} -m pip wheel -v -w $ARTIFACTS ./mercurial-{version}"],
             artifact=artifact.format(artifact_version),
@@ -334,7 +334,7 @@ def install(self):
         return ["{} -m pip install --force-reinstall {}".format(python, filename)]
 
 
-def install_rust(version="1.85.1", target="x86_64-unknown-linux-gnu"):
+def install_rust(version="1.88.0", target="x86_64-unknown-linux-gnu"):
     rustup_opts = "-y --default-toolchain none"
     cargo_dir = "$HOME/.cargo/bin/"
     rustup = cargo_dir + "rustup"
@@ -424,7 +424,7 @@ def prefix(p, s):
         elif variant:
             raise Exception("Unknown variant: {}".format(variant))
 
-        environ["CC"] = "clang-19"
+        environ["CC"] = "clang-20"
 
         if os.startswith("mingw"):
             cpu = msys.msys_cpu(env.cpu)
@@ -458,7 +458,7 @@ def prefix(p, s):
             environ[f"CARGO_TARGET_{TARGET}_RUSTFLAGS"] = " ".join(
                 f"-C link-arg={arg}" for arg in link_args
             )
-            environ["AR"] = "llvm-ar-19"
+            environ["AR"] = "llvm-ar-20"
             rustflags = environ.pop("RUSTFLAGS", None)
             if rustflags:
                 environ[f"CARGO_TARGET_{TARGET}_RUSTFLAGS"] += f" {rustflags}"
@@ -510,7 +510,7 @@ def prefix(p, s):
             self,
             task_env=build_env,
             description="build {} {}{}".format(env.os, cpu, prefix(" ", desc_variant)),
-            index="build.{}.{}.{}{}".format(hash, env.os, cpu, prefix(".", variant)),
+            index="build.{}.{}{}.{}".format(env.os, cpu, prefix(".", variant), hash),
             command=Task.checkout(commit=head)
             + sdk_install
             + rust_install