Skip to content

Commit

Permalink
Auto merge of #339 - sagudev:uwp2, r=jdm
Browse files Browse the repository at this point in the history
Fix UWP builds

Only temporary fix of: #327
I think the main reason of fail was System LLVM and Rust LLVM become out of sync.
  • Loading branch information
bors-servo authored Jan 21, 2023
2 parents 4fdcc27 + 2e01a7e commit 0b37834
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ jobs:
fail-fast: false
matrix:
features: ["--features debugmozjs", ""]
target: [""]
#target: ["", "aarch64-uwp-windows-msvc", "x86_64-uwp-windows-msvc"]
#target: [""]
target: ["", "aarch64-uwp-windows-msvc", "x86_64-uwp-windows-msvc"]
steps:
- uses: actions/checkout@v2
- name: Install deps
Expand All @@ -71,7 +71,7 @@ jobs:
.\MozillaBuildSetup.exe /S | Out-Null
iwr -useb get.scoop.sh -outfile 'install.ps1'
.\install.ps1 -RunAsAdmin
scoop install llvm@14.0.6 --global
scoop install llvm@15.0.7 --global
echo "C:\ProgramData\scoop\shims;C:\Users\runneradmin\scoop\shims" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
- uses: dtolnay/rust-toolchain@stable
- name: Build uwp
Expand All @@ -88,8 +88,9 @@ jobs:
LIBCLANG_PATH: "C:\\ProgramData\\scoop\\apps\\llvm\\current\\lib"
run: |
rustup install nightly-2022-11-20
rustup default nightly
rustup default nightly-2022-11-20
rustup component add rust-src
rustc --version --verbose
cargo build --verbose ${{ matrix.features }} -Z build-std=std,panic_abort --target ${{ matrix.target }}
- name: Build Windows
if: contains(matrix.target, 'uwp') != true
Expand Down

0 comments on commit 0b37834

Please sign in to comment.