diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 25fcfde55e..5422b7b9e6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,11 +57,6 @@ jobs: fail-fast: true matrix: platform: [windows-latest, macos-latest, ubuntu-20.04] - include: - - default-flags: "" - # linux CI cannot handle clipboard feature - - platform: ubuntu-20.04 - default-flags: "--no-default-features --features=default-no-clipboard" runs-on: ${{ matrix.platform }} @@ -72,7 +67,7 @@ jobs: uses: actions-rust-lang/setup-rust-toolchain@v1.9.0 - name: Tests - run: cargo test --workspace --profile ci --exclude nu_plugin_* ${{ matrix.default-flags }} + run: cargo test --workspace --profile ci --exclude nu_plugin_* - name: Check for clean repo shell: bash run: | diff --git a/Cargo.toml b/Cargo.toml index 2a1b9a0439..22afaccf49 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -248,10 +248,8 @@ plugin = [ "nu-protocol/plugin", "nu-engine/plugin", ] -default = ["default-no-clipboard", "system-clipboard"] -# Enables convenient omitting of the system-clipboard feature, as it leads to problems in ci on linux -# See https://github.com/nushell/nushell/pull/11535 -default-no-clipboard = [ + +default = [ "plugin", "trash-support", "sqlite", @@ -265,6 +263,8 @@ stable = ["default"] static-link-openssl = ["dep:openssl", "nu-cmd-lang/static-link-openssl"] mimalloc = ["nu-cmd-lang/mimalloc", "dep:mimalloc"] +# Optional system clipboard support in `reedline`, this behavior has problematic compatibility with some systems. +# Missing X server/ Wayland can cause issues system-clipboard = [ "reedline/system_clipboard", "nu-cli/system-clipboard", diff --git a/crates/nu-utils/src/sample_config/default_config.nu b/crates/nu-utils/src/sample_config/default_config.nu index 5345613d3b..32ddbcf511 100644 --- a/crates/nu-utils/src/sample_config/default_config.nu +++ b/crates/nu-utils/src/sample_config/default_config.nu @@ -854,8 +854,6 @@ $env.config = { } # The following bindings with `*system` events require that Nushell has # been compiled with the `system-clipboard` feature. - # This should be the case for Windows, macOS, and most Linux distributions - # Not available for example on Android (termux) # If you want to use the system clipboard for visual selection or to # paste directly, uncomment the respective lines and replace the version # using the internal clipboard. @@ -890,4 +888,4 @@ $env.config = { event: { edit: selectall } } ] -} \ No newline at end of file +}