Accepting request 1008038 from home:uncomfyhalomacro

- Don't rebuild the plugins. Seems to cause a version mismatch.

OBS-URL: https://build.opensuse.org/request/show/1008038
OBS-URL: https://build.opensuse.org/package/show/utilities/zellij?expand=0&rev=21
This commit is contained in:
Soc Virnyl Estela 2022-10-04 23:04:11 +00:00 committed by Git OBS Bridge
parent 624bf8c02d
commit 6eaa891e5c
2 changed files with 19 additions and 14 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Oct 4 17:03:17 UTC 2022 - Soc Virnyl Estela <socvirnyl.estela@gmail.com>
- Don't rebuild the plugins. Seems to cause a version mismatch.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Oct 4 16:27:54 UTC 2022 - Soc Virnyl Estela <socvirnyl.estela@gmail.com> Tue Oct 4 16:27:54 UTC 2022 - Soc Virnyl Estela <socvirnyl.estela@gmail.com>

View File

@ -78,25 +78,25 @@ Zsh command-line completion support for %{name}.
mkdir -p .cargo mkdir -p .cargo
cp %{SOURCE2} .cargo/config cp %{SOURCE2} .cargo/config
# Remove prebuilt binaries # Remove prebuilt binaries
rm assets/plugins/* # rm assets/plugins/*
%build %build
# First rebuilt plugins we just deleted # First rebuilt plugins we just deleted
# Note: RUSTFLAGS break linking with WASM-files, so we don't use the cargo_build-macro here # Note: RUSTFLAGS break linking with WASM-files, so we don't use the cargo_build-macro here
pushd default-plugins/status-bar # pushd default-plugins/status-bar
cargo --offline build --release --target=wasm32-wasi # cargo --offline build --release --target=wasm32-wasi
popd # popd
pushd default-plugins/tab-bar # pushd default-plugins/tab-bar
cargo --offline build --release --target=wasm32-wasi # cargo --offline build --release --target=wasm32-wasi
popd # popd
pushd default-plugins/strider # pushd default-plugins/strider
cargo --offline build --release --target=wasm32-wasi # cargo --offline build --release --target=wasm32-wasi
popd # popd
# Move the results to the place they are expected # Move the results to the place they are expected
mv target/wasm32-wasi/release/*.wasm assets/plugins/ # mv target/wasm32-wasi/release/*.wasm assets/plugins/
# Build zellij proper # Build zellij proper
%{cargo_build} --all-features %{cargo_build}
./target/release/zellij setup --generate-completion bash > target/zellij.bash ./target/release/zellij setup --generate-completion bash > target/zellij.bash
./target/release/zellij setup --generate-completion fish > target/zellij.fish ./target/release/zellij setup --generate-completion fish > target/zellij.fish
./target/release/zellij setup --generate-completion zsh > target/zellij.zsh ./target/release/zellij setup --generate-completion zsh > target/zellij.zsh
@ -105,11 +105,11 @@ mv target/wasm32-wasi/release/*.wasm assets/plugins/
install -Dm644 -t %{buildroot}%{_datadir}/bash-completion/completions/zellij ./target/zellij.bash install -Dm644 -t %{buildroot}%{_datadir}/bash-completion/completions/zellij ./target/zellij.bash
install -Dm644 -t %{buildroot}%{_datadir}/fish/vendor_completions.d/zellij.fish ./target/zellij.fish install -Dm644 -t %{buildroot}%{_datadir}/fish/vendor_completions.d/zellij.fish ./target/zellij.fish
install -Dm644 -t %{buildroot}%{_datadir}/zsh/site-functions/_zellij ./target/zellij.zsh install -Dm644 -t %{buildroot}%{_datadir}/zsh/site-functions/_zellij ./target/zellij.zsh
%{cargo_install} --all-features %{cargo_install}
%if %{with test} %if %{with test}
%check %check
%{cargo_test} --all-features %{cargo_test}
%endif %endif
%files %files