Skip to content

Commit 0b37834

Browse files
authored
Auto merge of #339 - sagudev:uwp2, r=jdm
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.
2 parents 4fdcc27 + 2e01a7e commit 0b37834

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

Diff for: .github/workflows/rust.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ jobs:
6161
fail-fast: false
6262
matrix:
6363
features: ["--features debugmozjs", ""]
64-
target: [""]
65-
#target: ["", "aarch64-uwp-windows-msvc", "x86_64-uwp-windows-msvc"]
64+
#target: [""]
65+
target: ["", "aarch64-uwp-windows-msvc", "x86_64-uwp-windows-msvc"]
6666
steps:
6767
- uses: actions/checkout@v2
6868
- name: Install deps
@@ -71,7 +71,7 @@ jobs:
7171
.\MozillaBuildSetup.exe /S | Out-Null
7272
iwr -useb get.scoop.sh -outfile 'install.ps1'
7373
.\install.ps1 -RunAsAdmin
74-
scoop install llvm@14.0.6 --global
74+
scoop install llvm@15.0.7 --global
7575
echo "C:\ProgramData\scoop\shims;C:\Users\runneradmin\scoop\shims" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
7676
- uses: dtolnay/rust-toolchain@stable
7777
- name: Build uwp
@@ -88,8 +88,9 @@ jobs:
8888
LIBCLANG_PATH: "C:\\ProgramData\\scoop\\apps\\llvm\\current\\lib"
8989
run: |
9090
rustup install nightly-2022-11-20
91-
rustup default nightly
91+
rustup default nightly-2022-11-20
9292
rustup component add rust-src
93+
rustc --version --verbose
9394
cargo build --verbose ${{ matrix.features }} -Z build-std=std,panic_abort --target ${{ matrix.target }}
9495
- name: Build Windows
9596
if: contains(matrix.target, 'uwp') != true

0 commit comments

Comments
 (0)