diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5c17d4110c1..7d08ab87c59 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -39,11 +39,6 @@ jobs: runs-on: windows-2019 needs: ["decision"] steps: - # FIXME LLVM 15 breaks Windows builds https://github.com/servo/servo/issues/29269 - - name: LLVM 14 - run: | - $llvmVersion = Get-LatestChocoPackageVersion -TargetVersion 14 -PackageName llvm - Choco-Install -PackageName llvm -ArgumentList '--allow-downgrade', '--version', $llvmVersion - uses: actions/checkout@v3 with: fetch-depth: 2 @@ -69,11 +64,6 @@ jobs: runs-on: windows-2019 needs: ["decision"] steps: - # FIXME LLVM 15 breaks Windows builds https://github.com/servo/servo/issues/29269 - - name: LLVM 14 - run: | - $llvmVersion = Get-LatestChocoPackageVersion -TargetVersion 14 -PackageName llvm - Choco-Install -PackageName llvm -ArgumentList '--allow-downgrade', '--version', $llvmVersion - uses: actions/checkout@v3 with: fetch-depth: 2 @@ -100,11 +90,6 @@ jobs: runs-on: windows-2019 needs: ["decision"] steps: - # FIXME LLVM 15 breaks Windows builds https://github.com/servo/servo/issues/29269 - - name: LLVM 14 - run: | - $llvmVersion = Get-LatestChocoPackageVersion -TargetVersion 14 -PackageName llvm - Choco-Install -PackageName llvm -ArgumentList '--allow-downgrade', '--version', $llvmVersion - uses: actions/checkout@v3 with: fetch-depth: 2 diff --git a/python/servo/packages.py b/python/servo/packages.py index e076d444eaf..3b375eb2877 100644 --- a/python/servo/packages.py +++ b/python/servo/packages.py @@ -4,7 +4,7 @@ WINDOWS_MSVC = { "cmake": "3.14.3", - "llvm": "14.0.6", + "llvm": "15.0.5", "moztools": "3.2", "ninja": "1.7.1", "nuget": "08-08-2019", diff --git a/python/servo/testing_commands.py b/python/servo/testing_commands.py index c98311ad9c5..2d14107af97 100644 --- a/python/servo/testing_commands.py +++ b/python/servo/testing_commands.py @@ -49,7 +49,7 @@ WEB_PLATFORM_TESTS_PATH = os.path.join("tests", "wpt", "web-platform-tests") SERVO_TESTS_PATH = os.path.join("tests", "wpt", "mozilla", "tests") CLANGFMT_CPP_DIRS = ["support/hololens/"] -CLANGFMT_VERSION = "14" +CLANGFMT_VERSION = "15" TEST_SUITES = OrderedDict([ ("tidy", {"kwargs": {"all_files": False, "no_progress": False, "self_test": False,