From ed2974a280cda657e2f2da11bc9efdebbeb958f4 Mon Sep 17 00:00:00 2001 From: Mukilan Thiyagarajan Date: Tue, 24 Jan 2023 19:59:58 +0530 Subject: [PATCH] Revert "Auto merge of #29270 - delan:fix-windows-builds, r=" This reverts commit 7a885032e65bdf9752b644e42e20d0e2c7b42a4f, reversing changes made to f70857906d228f5db6a808c8d9c28a7bad0684bb. Since we have now uploaded the LLVM 15.0.5 binaries to S3 so that `mach boostrap` can use them directly, we no longer need to downgrade the LLVM in GitHub runner image. --- .github/workflows/main.yml | 15 --------------- 1 file changed, 15 deletions(-) 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