Merge pull request #543 from LiveSplit/dependabot/cargo/tiny-skia-0.7.0

LiveSplit · Jul 6, 2022 · 06c76ef · 06c76ef
2 parents 2d4d037 + 8ad67b2
commit 06c76ef
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 35 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -353,6 +353,8 @@ jobs:
           - label: Linux x86_64 gnux32
             target: x86_64-unknown-linux-gnux32
             os: ubuntu-latest
+            cross: skip
+            install_target: true
             tests: skip
             dylib: skip
 
@@ -626,11 +628,8 @@ jobs:
         run: rustup target add ${{ matrix.target }}
 
       - name: Install cross
-        if: matrix.cross == ''
-        run: sh .github/workflows/install.sh
-        env:
-          OS_NAME: ${{ matrix.os }}
-          TARGET: ${{ matrix.target }}
+        if: matrix.cross == '' && matrix.no_std == ''
+        run: cargo install cross
 
       - name: Build Static Library
         run: sh .github/workflows/build_static.sh

diff --git a/.github/workflows/install.sh b/.github/workflows/install.sh
diff --git a/Cargo.toml b/Cargo.toml
@@ -71,8 +71,8 @@ ttf-parser = { version = "0.15.0", default-features = false, optional = true }
 font-kit = { version = "0.11.0", optional = true }
 
 # Software Rendering
-tiny-skia = { version = "0.6.0", default-features = false, features = [
-    "libm",
+tiny-skia = { version = "0.7.0", default-features = false, features = [
+    "no-std-float",
     "simd",
 ], optional = true }