From b007e159e1d852170f4281546ffcfba0469c5488 Mon Sep 17 00:00:00 2001 From: Jonathan Schwender Date: Thu, 29 Aug 2024 13:18:57 +0800 Subject: [PATCH 1/2] Bump mozangle to v0.5.1 (matching servo) Signed-off-by: Jonathan Schwender --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index abcbb717..aa1e6e27 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -73,7 +73,7 @@ optional = true # Ensure that we have a static libEGL.lib present for linking with EGL bindings. [target.'cfg(target_os = "windows")'.dependencies.mozangle] -version = "0.4" +version = "0.5.1" features = ["egl", "build_dlls"] optional = true From 1a786787d35a05a09140ee8e5437015939f20959 Mon Sep 17 00:00:00 2001 From: Jonathan Schwender Date: Thu, 29 Aug 2024 13:23:06 +0800 Subject: [PATCH 2/2] CI: Use default LLVM on windows again Signed-off-by: Jonathan Schwender --- .github/workflows/main.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 428c1948..f5a56c86 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -51,12 +51,6 @@ jobs: run: | sudo apt update sudo apt install gcc libxxf86vm-dev libosmesa6-dev libgles2-mesa-dev -y - - name: Upgrade LLVM (Windows) - if: runner.os == 'Windows' - run: | - choco uninstall llvm - choco upgrade llvm --version=17.0.6 -y - echo "LLVM_PATH=C:\Program Files\LLVM\bin" >> $GITHUB_ENV - name: Install rust id: toolchain uses: dtolnay/rust-toolchain@master