diff --git a/.github/workflows/cpp_package.yaml b/.github/workflows/cpp_package.yaml index da66eac1be2e..7448d94c1fd2 100644 --- a/.github/workflows/cpp_package.yaml +++ b/.github/workflows/cpp_package.yaml @@ -10,7 +10,7 @@ on: env: MACOSX_DEPLOYMENT_TARGET: "11.0" # Keep in sync with features in nightly_snapshot.yaml, slint_tool_binary.yaml, and api/node/Cargo.toml - SLINT_BINARY_FEATURES: "-DSLINT_FEATURE_BACKEND_WINIT=ON -DSLINT_FEATURE_RENDERER_FEMTOVG=ON -DSLINT_FEATURE_RENDERER_SKIA=ON -DSLINT_FEATURE_RENDERER_SOFTWARE=ON" + SLINT_BINARY_FEATURES: "-DSLINT_FEATURE_BACKEND_LINUXKMS_NOSEAT=ON -DSLINT_FEATURE_BACKEND_WINIT=ON -DSLINT_FEATURE_RENDERER_FEMTOVG=ON -DSLINT_FEATURE_RENDERER_SKIA=ON -DSLINT_FEATURE_RENDERER_SOFTWARE=ON" jobs: cmake_package: diff --git a/.github/workflows/nightly_snapshot.yaml b/.github/workflows/nightly_snapshot.yaml index 7d7835f85c9c..93c4481a7501 100644 --- a/.github/workflows/nightly_snapshot.yaml +++ b/.github/workflows/nightly_snapshot.yaml @@ -23,7 +23,7 @@ on: env: # Keep in sync with features in slint_tool_binary.yaml, cpp_package.yaml, and api/node/Cargo.toml - SLINT_BINARY_FEATURES: "backend-winit,renderer-femtovg,renderer-skia,renderer-software" + SLINT_BINARY_FEATURES: "backend-linuxkms-noseat,backend-winit,renderer-femtovg,renderer-skia,renderer-software" MACOSX_DEPLOYMENT_TARGET: "11.0" jobs: @@ -207,7 +207,7 @@ jobs: with: crate: cross - name: Build LSP - run: cross build --target ${{ matrix.target }} --features backend-linuxkms-noseat,${{ env.SLINT_BINARY_FEATURES }} --release -p slint-lsp + run: cross build --target ${{ matrix.target }} --features ${{ env.SLINT_BINARY_FEATURES }} --release -p slint-lsp - name: Create artifact directory run: | mkdir bin diff --git a/.github/workflows/publish_npm_package.yaml b/.github/workflows/publish_npm_package.yaml index af89dfb48951..2f2e7d69fd34 100644 --- a/.github/workflows/publish_npm_package.yaml +++ b/.github/workflows/publish_npm_package.yaml @@ -59,23 +59,18 @@ jobs: - os: ubuntu-20.04 rust-target: x86_64-unknown-linux-gnu napi-rs-target: linux-x64-gnu - defaults-tag: binaries-linux - os: macos-latest rust-target: x86_64-apple-darwin napi-rs-target: darwin-x64 - defaults-tag: binaries - os: macos-latest rust-target: aarch64-apple-darwin napi-rs-target: darwin-arm64 - defaults-tag: binaries - os: windows-2022 rust-target: x86_64-pc-windows-msvc napi-rs-target: win32-x64-msvc - defaults-tag: binaries - os: windows-2022 rust-target: i686-pc-windows-msvc napi-rs-target: win32-ia32-msvc - defaults-tag: binaries needs: determine_version runs-on: ${{ matrix.os }} steps: @@ -103,7 +98,7 @@ jobs: shell: bash run: | perl -pi -e 's,^default =.*,,' Cargo.toml - perl -pi -e 's,# ${{ matrix.defaults-tag }}:,,' Cargo.toml + perl -pi -e 's,# binaries:,,' Cargo.toml echo "New defaults:" grep "^\s*default =" Cargo.toml - name: Build binary diff --git a/.github/workflows/slint_tool_binary.yaml b/.github/workflows/slint_tool_binary.yaml index e5b3ce55b6f2..85b4f07a723f 100644 --- a/.github/workflows/slint_tool_binary.yaml +++ b/.github/workflows/slint_tool_binary.yaml @@ -16,7 +16,7 @@ on: type: string description: features to enable for build # Keep in sync with features in nightly_snapshot.yaml, cpp_package.yaml, and api/node/Cargo.toml - default: "backend-winit,renderer-femtovg,renderer-skia,renderer-software" + default: "backend-linuxkms-noseat,backend-winit,renderer-femtovg,renderer-skia,renderer-software" codesign: type: boolean description: Sign binaries on macOS (false for manual builds) @@ -31,7 +31,7 @@ on: type: string description: features to enable for build # Keep in sync with features in nightly_snapshot.yaml, cpp_package.yaml, and api/node/Cargo.toml - default: "backend-winit,renderer-femtovg,renderer-skia,renderer-software" + default: "backend-linuxkms-noseat,backend-winit,renderer-femtovg,renderer-skia,renderer-software" codesign: type: boolean description: Sign binaries on macOS diff --git a/api/node/Cargo.toml b/api/node/Cargo.toml index 51b483237451..96f9b8770f82 100644 --- a/api/node/Cargo.toml +++ b/api/node/Cargo.toml @@ -22,8 +22,7 @@ crate-type = ["cdylib"] [features] default = ["backend-winit", "renderer-femtovg", "backend-qt", "accessibility"] # Keep in sync with features in nightly_snapshot.yaml, cpp_package.yaml, and slint_tool_binary.yaml -# binaries: default = ["backend-winit", "renderer-femtovg", "renderer-skia", "accessibility"] -# binaries-linux: default = ["backend-linuxkms-noseat", "backend-winit", "renderer-femtovg", "renderer-skia", "accessibility"] +# binaries: default = ["backend-linuxkms-noseat", "backend-winit", "renderer-femtovg", "renderer-skia", "accessibility"] backend-qt = ["slint-interpreter/backend-qt"] backend-winit = ["slint-interpreter/backend-winit"]