diff --git a/.github/actions/install-skia-dependencies/action.yaml b/.github/actions/install-skia-dependencies/action.yaml new file mode 100644 index 000000000000..526309510e97 --- /dev/null +++ b/.github/actions/install-skia-dependencies/action.yaml @@ -0,0 +1,20 @@ +# Copyright © SixtyFPS GmbH +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0 + +--- +name: Install Skia dependencies +description: Set up dependencies needed to build Skia + +runs: + using: composite + steps: + - name: Install Ninja + if: runner.os == 'macOS' + run: | + brew install ninja + shell: bash + - name: Install Ninja + if: runner.os == 'Windows' + run: | + choco install ninja + shell: bash diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 689d6d12f877..dccfff8d0b21 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -53,6 +53,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: ./.github/actions/install-linux-dependencies + - uses: ./.github/actions/install-skia-dependencies - uses: actions/setup-python@v5 with: python-version: '3.10' diff --git a/.github/workflows/cpp_package.yaml b/.github/workflows/cpp_package.yaml index 188418125d7f..bb89ab43ae7f 100644 --- a/.github/workflows/cpp_package.yaml +++ b/.github/workflows/cpp_package.yaml @@ -58,10 +58,6 @@ jobs: - name: Prepare licenses run: bash -x ../../scripts/prepare_binary_package.sh ${{ runner.workspace }}/cppbuild working-directory: api/cpp/ - # Pin Python version until https://github.com/slint-ui/slint/issues/6615 is fixed. - - uses: actions/setup-python@v5 - with: - python-version: '3.12' - uses: ilammy/msvc-dev-cmd@v1 - name: Select MSVC (windows) run: | diff --git a/.github/workflows/nightly_snapshot.yaml b/.github/workflows/nightly_snapshot.yaml index 280a5406f99b..8b970be282a0 100644 --- a/.github/workflows/nightly_snapshot.yaml +++ b/.github/workflows/nightly_snapshot.yaml @@ -124,10 +124,6 @@ jobs: target: x86_64-apple-darwin - name: Install cargo-bundle run: cargo install --version=0.6.0 cargo-bundle - # Pin Python version until https://github.com/slint-ui/slint/issues/6615 is fixed. - - uses: actions/setup-python@v5 - with: - python-version: '3.12' - name: Build Main LSP Bundle working-directory: tools/lsp run: cargo bundle --release --features ${{ env.SLINT_BINARY_FEATURES }} @@ -151,10 +147,6 @@ jobs: - uses: ./.github/actions/setup-rust with: target: aarch64-apple-darwin - # Pin Python version until https://github.com/slint-ui/slint/issues/6615 is fixed. - - uses: actions/setup-python@v5 - with: - python-version: '3.12' - name: Build AArch64 LSP run: cargo build --target aarch64-apple-darwin --features ${{ env.SLINT_BINARY_FEATURES }} --release -p slint-lsp - name: Create artifact directory diff --git a/.github/workflows/publish_npm_package.yaml b/.github/workflows/publish_npm_package.yaml index bfba18564bf9..5137e1d49933 100644 --- a/.github/workflows/publish_npm_package.yaml +++ b/.github/workflows/publish_npm_package.yaml @@ -87,10 +87,6 @@ jobs: - name: Upgrade LLVM for Skia build on Windows if: runner.os == 'Windows' run: choco upgrade llvm - # Pin Python version until https://github.com/slint-ui/slint/issues/6615 is fixed. - - uses: actions/setup-python@v5 - with: - python-version: '3.12' # Setup .npmrc file to publish to npm - uses: actions/setup-node@v4 with: diff --git a/.github/workflows/slint_tool_binary.yaml b/.github/workflows/slint_tool_binary.yaml index 800881d3565d..7d2c6af312a6 100644 --- a/.github/workflows/slint_tool_binary.yaml +++ b/.github/workflows/slint_tool_binary.yaml @@ -158,10 +158,6 @@ jobs: - uses: ./.github/actions/setup-rust with: target: aarch64-apple-darwin - # Pin Python version until https://github.com/slint-ui/slint/issues/6615 is fixed. - - uses: actions/setup-python@v5 - with: - python-version: '3.12' - uses: baptiste0928/cargo-install@v3 with: crate: cargo-about diff --git a/internal/renderers/skia/Cargo.toml b/internal/renderers/skia/Cargo.toml index 7a595ceb0792..8e9b2be3b0a4 100644 --- a/internal/renderers/skia/Cargo.toml +++ b/internal/renderers/skia/Cargo.toml @@ -42,7 +42,7 @@ pin-weak = "1" scoped-tls-hkt = "0.1" raw-window-handle = { version = "0.6", features = ["std"] } -skia-safe = { version = "0.78.0", features = ["textlayout", "gl"] } +skia-safe = { version = "0.81.0", features = ["textlayout", "gl"] } glow = { version = "0.13" } unicode-segmentation = { workspace = true } @@ -59,7 +59,7 @@ bytemuck = { workspace = true } [target.'cfg(target_family = "windows")'.dependencies] windows = { version = "0.58.0", features = ["Win32", "Win32_System_Com", "Win32_Graphics", "Win32_Graphics_Dxgi", "Win32_Graphics_Direct3D12", "Win32_Graphics_Direct3D", "Win32_Foundation", "Win32_Graphics_Dxgi_Common", "Win32_System_Threading", "Win32_Security"] } -skia-safe = { version = "0.78.0", features = ["d3d"] } +skia-safe = { version = "0.81.0", features = ["d3d"] } [target.'cfg(target_vendor = "apple")'.dependencies] objc2 = { version = "0.5.2" } @@ -67,11 +67,11 @@ objc2-metal = { version = "0.2.2", features = ["MTLCommandQueue", "MTLCommandBuf objc2-foundation = { version = "0.2.2"} objc2-quartz-core = { version = "0.2.2" } objc2-app-kit = { version = "0.2.2" } -skia-safe = { version = "0.78.0", features = ["metal"] } +skia-safe = { version = "0.81.0", features = ["metal"] } raw-window-metal = "1.0" [target.'cfg(not(any(target_vendor = "apple", target_family = "windows")))'.dependencies] -skia-safe = { version = "0.78.0", features = ["gl"] } +skia-safe = { version = "0.81.0", features = ["gl"] } [build-dependencies] cfg_aliases = { workspace = true }