Skip to content

Commit

Permalink
Remove hacks in the CI for selecting backend-linuxkms-noseat
Browse files Browse the repository at this point in the history
The feature flag should be safe to enable on all platforms, it'll just be a no-op backend.
  • Loading branch information
tronical committed Jan 26, 2024
1 parent c10f0c7 commit 52838a0
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cpp_package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nightly_snapshot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
7 changes: 1 addition & 6 deletions .github/workflows/publish_npm_package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/slint_tool_binary.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand Down
3 changes: 1 addition & 2 deletions api/node/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down

0 comments on commit 52838a0

Please sign in to comment.