Skip to content

Commit 2f0dccf

Browse files
committed
always calculate VERSION_CURRENT for rpm-package-build task
1 parent 34f225d commit 2f0dccf

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

.evergreen/build_snapshot_rpm.sh

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,12 @@ sudo mock -r ${config} --use-bootstrap-image --isolation=simple --init
8989
mock_root=$(sudo mock -r ${config} --use-bootstrap-image --isolation=simple --print-root-path)
9090
sudo mock -r ${config} --use-bootstrap-image --isolation=simple --install rpmdevtools git rpm-build cmake python python3-sphinx gcc openssl-devel
9191
sudo mock -r ${config} --use-bootstrap-image --isolation=simple --copyin "$(pwd)" "$(pwd)/${spec_file}" /tmp
92-
if [ ! -f VERSION_CURRENT ]; then
93-
sudo mock -r ${config} --use-bootstrap-image --isolation=simple --cwd "/tmp/${build_dir}" --chroot -- /bin/sh -c "(
94-
set -o xtrace ;
95-
python build/calc_release_version.py | sed -E 's/([^-]+).*/\1/' > VERSION_CURRENT ;
96-
python build/calc_release_version.py -p > VERSION_RELEASED
97-
)"
98-
sudo mock -r ${config} --use-bootstrap-image --isolation=simple --copyout "/tmp/${build_dir}/VERSION_CURRENT" "/tmp/${build_dir}/VERSION_RELEASED" .
99-
fi
92+
sudo mock -r ${config} --use-bootstrap-image --isolation=simple --cwd "/tmp/${build_dir}" --chroot -- /bin/sh -c "(
93+
set -o xtrace ;
94+
python build/calc_release_version.py | sed -E 's/([^-]+).*/\1/' > VERSION_CURRENT ;
95+
python build/calc_release_version.py -p > VERSION_RELEASED
96+
)"
97+
sudo mock -r ${config} --use-bootstrap-image --isolation=simple --copyout "/tmp/${build_dir}/VERSION_CURRENT" "/tmp/${build_dir}/VERSION_RELEASED" .
10098

10199
bare_upstream_version=$(sed -E 's/([^-]+).*/\1/' VERSION_CURRENT)
102100
# Upstream version in the .spec file cannot have hyphen (-); replace the current

0 commit comments

Comments
 (0)