Try to get clang-format to build

Author: alexreinking

master/master.cfg

@@ -2,9 +2,9 @@
 # ex: set syntax=python:
 # vim: set syntax=python:
 # comment
+import logging
 import os
 import re
-import logging
 from collections import defaultdict
 from dataclasses import dataclass
 from enum import Enum
@@ -97,7 +97,7 @@ LLVM_RELEASE_18 = "release_18"
 
 LLVM_BRANCHES = {
     LLVM_MAIN: VersionedBranch(ref="main", version=Version(22, 0, 0)),
-    LLVM_RELEASE_21: VersionedBranch(ref="llvmorg-21.1.1", version=Version(21, 1, 1)),
+    LLVM_RELEASE_21: VersionedBranch(ref="llvmorg-21.1.6", version=Version(21, 1, 6)),
     LLVM_RELEASE_20: VersionedBranch(ref="llvmorg-20.1.8", version=Version(20, 1, 8)),
     LLVM_RELEASE_19: VersionedBranch(ref="llvmorg-19.1.7", version=Version(19, 1, 7)),
     # LLVM_RELEASE_18: VersionedBranch(ref="llvmorg-18.1.8", version=Version(18, 1, 8)),
@@ -129,8 +129,8 @@ _HALIDE_RELEASES = [
 ]
 
 HALIDE_BRANCHES = {
-    HALIDE_MAIN: VersionedBranch(ref="main", version=Version(20, 0, 0)),
-    HALIDE_RELEASE_21: VersionedBranch(ref="release/21.x", version=Version(19, 0, 0)),
+    HALIDE_MAIN: VersionedBranch(ref="main", version=Version(22, 0, 0)),
+    HALIDE_RELEASE_21: VersionedBranch(ref="release/21.x", version=Version(21, 0, 0)),
     HALIDE_RELEASE_19: VersionedBranch(ref="release/19.x", version=Version(19, 0, 0)),
     # HALIDE_RELEASE_18: VersionedBranch(ref="release/18.x", version=Version(18, 0, 0)),
     # HALIDE_RELEASE_17: VersionedBranch(ref="release/17.x", version=Version(17, 0, 2)),
@@ -774,7 +774,7 @@ _LLVM_OFF_OPTS = [
     "CLANG_TOOL_CLANG_CHECK_BUILD",
     "CLANG_TOOL_CLANG_DIFF_BUILD",
     "CLANG_TOOL_CLANG_EXTDEF_MAPPING_BUILD",
-    "CLANG_TOOL_CLANG_FORMAT_BUILD",
+    # "CLANG_TOOL_CLANG_FORMAT_BUILD",  # no: developers need this
     "CLANG_TOOL_CLANG_FORMAT_VS_BUILD",
     "CLANG_TOOL_CLANG_FUZZER_BUILD",
     "CLANG_TOOL_CLANG_IMPORT_TEST_BUILD",