Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix UWP builds #339

Merged
merged 1 commit into from
Jan 21, 2023
Merged

Fix UWP builds #339

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 5 additions & 4 deletions .github/workflows/rust.yml
View file
Open in desktop
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