keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ci: fix install-extra logic

Browse Source 
This fixes `install-extra-builddeps.sh` helper, by letting cargo
detect whether the target binary is already present in the
environment with the expected version.
This is in order to avoid mismatches in generated code when the
library version is bumped, and stale binaries are present on
the system.
This commit is contained in:
Luca BRUNO 2021-01-25 14:04:35 +00:00 committed by OpenShift Merge Robot
parent 2e7192466a
commit 85640d44f6
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ci/install-extra-builddeps.sh
View File

@ -1,14 +1,13 @@
#!/usr/bin/bash #!/usr/bin/env bash
# cxx.rs (cxxbridge) isn't packaged in Fedora today. Both it and cbindgen generate # cxx.rs (cxxbridge) isn't packaged in Fedora today. Both it and cbindgen generate
# source code, which we vendor along with our dependent crates into release # source code, which we vendor along with our dependent crates into release
# tarballs. Note in the future it's likely we stop using cbindgen entirely in # tarballs. Note in the future it's likely we stop using cbindgen entirely in
# favor of cxx.rs. # favor of cxx.rs.
set -xeuo pipefail
if ! command -v cxxbridge; then set -euo pipefail
ver=$(cargo metadata --format-version 1 | jq -r '.packages[]|select(.name == "cxx").version')
cargo install cxxbridge-cmd --version "${ver}" CXX_VER=$(cargo metadata --format-version 1 | jq -r '.packages[]|select(.name == "cxx").version')
fi cargo install cxxbridge-cmd --version "${CXX_VER}"
if ! command -v cbindgen; then
ver=$(cargo metadata --format-version 1 | jq -r '.packages[]|select(.name == "cbindgen").version') CBINDGEN_VER=$(cargo metadata --format-version 1 | jq -r '.packages[]|select(.name == "cbindgen").version')
cargo install cbindgen --version "${ver}" cargo install cbindgen --version "${CBINDGEN_VER}"
fi