Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@
*.basisu_ktx2 filter=lfs diff=lfs merge=lfs -text
vendor/basis_universal/**/* filter=lfs diff=lfs merge=lfs -text
*.wasm filter=lfs diff=lfs merge=lfs -text
crates/basisu_sys/wasm/* filter=lfs diff=lfs merge=lfs -text
34 changes: 25 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,28 +13,44 @@ concurrency:

env:
CARGO_TERM_COLOR: always
EM_VERSION: 4.0.22

jobs:
build-macos-windows:
name: Build ${{matrix.os}}
runs-on: ${{matrix.os}}
strategy:
fail-fast: false
matrix:
os: [macos-latest, windows-latest]

build-linux-wasm:
name: Build linux,wasm
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
lfs: true

- name: Install Linux dependencies
uses: ./.github/actions/install-linux-deps

- name: Install rust toolchain
uses: dtolnay/rust-toolchain@master
with:
toolchain: stable
targets: wasm32-unknown-unknown

- name: Install Emscripten
uses: mymindstorm/setup-emsdk@v14
with:
version: ${{ env.EM_VERSION }}

- name: Install wasm-opt
run: wget https://github.com/WebAssembly/binaryen/releases/download/version_125/binaryen-version_125-x86_64-linux.tar.gz && tar -xvf binaryen-version_125-x86_64-linux.tar.gz && sudo cp binaryen-version_125/bin/wasm-opt /usr/local/bin/ && rm -r binaryen-version_125 && rm binaryen-version_125-x86_64-linux.tar.gz

- name: Clippy
run: cargo clippy -- -D warnings
run: cargo clippy --workspace --all-targets --all-features -- -D warnings

- name: Build
run: cargo build --verbose

- name: Build basisu vendor wasm
run: cargo r -p bevy_basisu_loader_sys --bin build-wasm-cli --features build-wasm-cli -- --emcc-flags="-Os -flto=full" --wasm-opt-flags="-Os"

- name: Upload artifact
uses: actions/upload-artifact@v4
with:
path: crates/basisu_sys/wasm/
36 changes: 10 additions & 26 deletions .github/workflows/ci_full.yml → .github/workflows/ci_minimal.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Rust CI Full
name: Rust CI Minimal

on:
workflow_dispatch:
Expand All @@ -13,49 +13,33 @@ concurrency:

env:
CARGO_TERM_COLOR: always
EM_VERSION: 4.0.22
ANDROID_NDK_VERSION: 28.1.13356709

jobs:
build-linux-wasm:
name: Build linux,wasm
runs-on: ubuntu-latest
build-macos-windows:
name: Build ${{matrix.os}}
runs-on: ${{matrix.os}}
strategy:
fail-fast: false
matrix:
os: [macos-latest, windows-latest]

steps:
- uses: actions/checkout@v4
with:
lfs: true

- name: Install Linux dependencies
uses: ./.github/actions/install-linux-deps

- name: Install rust toolchain
uses: dtolnay/rust-toolchain@master
with:
toolchain: stable
targets: wasm32-unknown-unknown

- name: Install Emscripten
uses: mymindstorm/setup-emsdk@v14
with:
version: ${{ env.EM_VERSION }}

- name: Install wasm-opt
run: wget https://github.com/WebAssembly/binaryen/releases/download/version_125/binaryen-version_125-x86_64-linux.tar.gz && tar -xvf binaryen-version_125-x86_64-linux.tar.gz && sudo cp binaryen-version_125/bin/wasm-opt /usr/local/bin/ && rm -r binaryen-version_125 && rm binaryen-version_125-x86_64-linux.tar.gz

- name: Clippy
run: cargo clippy --workspace --all-targets --all-features -- -D warnings
run: cargo clippy -- -D warnings

- name: Build
run: cargo build --verbose

- name: Build basisu vendor wasm
run: cargo r -p bevy_basisu_loader_sys --bin build-wasm-cli --features build-wasm-cli -- --emcc-flags="-Os -flto=full" --wasm-opt-flags="-Os"

- name: Upload artifact
uses: actions/upload-artifact@v4
with:
path: crates/basisu_sys/wasm/

build-android:
name: Build android
runs-on: ubuntu-latest
Expand Down
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "bevy_basisu_loader"
version = "0.1.7"
version = "0.2.0"
edition = "2024"
repository.workspace = true
license.workspace = true
Expand All @@ -22,7 +22,7 @@ bevy = { version = "0.17", default-features = false, features = [
serde = { version = "1", features = ["derive"] }
thiserror = { version = "2", default-features = false }
log = { version = "0.4", default-features = false }
bevy_basisu_loader_sys = { version = "0.1", path = "crates/basisu_sys" }
bevy_basisu_loader_sys = { version = "0.2", path = "crates/basisu_sys" }

[workspace]
members = ["crates/*", "examples/test_scene"]
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Web demo: https://beicause.github.io/bevy_basisu_loader/

1. Add the Cargo dependency:
```toml
bevy_basisu_loader = "0.1"
bevy_basisu_loader = "0.2"
```

2. Add `BasisuLoaderPlugin`:
Expand Down Expand Up @@ -67,7 +67,7 @@ cargo r -p bevy_basisu_loader_sys --bin build-wasm-cli --features build-wasm-cli

| `bevy` | `bevy_basisu_loader` |
| ------ | -------------------- |
| 0.17 | 0.1 |
| 0.17 | 0.1, 0.2 |

## License

Expand Down
2 changes: 2 additions & 0 deletions crates/basisu_sys/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
wasm/*.js
wasm/*.wasm
4 changes: 2 additions & 2 deletions crates/basisu_sys/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[package]
name = "bevy_basisu_loader_sys"
version = "0.1.7"
version = "0.2.0"
edition = "2024"
repository.workspace = true
license.workspace = true
description = "A rust wrapper around the Basis Universal transcoder library"
keywords = ["basis", "universal", "ffi", "transcoder"]
exclude = ["src/bin/build_wasm_cli.rs"]
include = ["vendor/", "wasm/", "src/*.rs"]

[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu", "wasm32-unknown-unknown"]
Expand Down
Empty file added crates/basisu_sys/wasm/.gitkeep
Empty file.
3 changes: 0 additions & 3 deletions crates/basisu_sys/wasm/basisu_vendor.js

This file was deleted.

3 changes: 0 additions & 3 deletions crates/basisu_sys/wasm/basisu_vendor.wasm

This file was deleted.

Loading