Skip to content

Commit

Permalink
Fix Web CI (#202)
Browse files Browse the repository at this point in the history
  • Loading branch information
daxpedda authored Mar 5, 2024
1 parent 6a45203 commit 2bcb5c9
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
11 changes: 7 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,14 +87,17 @@ jobs:
if: (matrix.platform.os == 'ubuntu-latest') && contains(matrix.platform.target, 'i686')
run: sudo apt-get install gcc-multilib

- name: Pin deps that break MSRV
if: matrix.rust_version == '1.65.0'
run: |
cargo update -p exr --precise 1.71.0
cargo update -p ahash --precise 0.8.7
cargo update -p bumpalo --precise 3.14.0
- name: Build crate
shell: bash
run: cargo $CMD build --verbose --target ${{ matrix.platform.target }} $OPTIONS --features $FEATURES

- name: Pin versions of dev-deps
if: matrix.rust_version == '1.65.0'
run: cargo update -p exr --precise 1.71.0 && cargo update -p ahash --precise 0.8.7

- name: Build tests
shell: bash
if: >
Expand Down
2 changes: 1 addition & 1 deletion src/backends/web.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ use web_sys::{OffscreenCanvas, OffscreenCanvasRenderingContext2d};
use crate::backend_interface::*;
use crate::error::{InitError, SwResultExt};
use crate::{util, NoDisplayHandle, NoWindowHandle, Rect, SoftBufferError};
use std::convert::TryInto;
use std::marker::PhantomData;
use std::num::NonZeroU32;

Expand Down Expand Up @@ -154,6 +153,7 @@ impl<D: HasDisplayHandle, W: HasWindowHandle> WebImpl<D, W> {
);

#[cfg(target_feature = "atomics")]
#[allow(non_local_definitions)]
let result = {
// When using atomics, the underlying memory becomes `SharedArrayBuffer`,
// which can't be shared with `ImageData`.
Expand Down

0 comments on commit 2bcb5c9

Please sign in to comment.