Skip to content

Commit

Permalink
PMM-13487 Use full_commit for the hash as well
Browse files Browse the repository at this point in the history
  • Loading branch information
ademidoff committed Nov 22, 2024
1 parent 0ba4b93 commit 29adcec
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 11 deletions.
4 changes: 0 additions & 4 deletions build/packages/rpm/server/SPECS/pmm-ui.spec
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ pmm-ui is the frontend application for pmm-managed.
%setup -q -n %{repo}-%{commit}

%build
export PMM_RELEASE_VERSION=%{full_pmm_version}
export PMM_RELEASE_FULLCOMMIT=%{commit}
export PMM_RELEASE_BRANCH=""

make -C ui release

%install
Expand Down
15 changes: 8 additions & 7 deletions build/scripts/build-server-rpm
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ prepare_spec() {
local spec_name=$1
local repo_name=$2
local spec_file=${rpmbuild_dir}/${spec_name}.spec
local full_commit=

mkdir -p ${rpms_dir} ${rpmbuild_dir} 2>/dev/null || :
cp ${rpmspec_dir}/${spec_name}.spec ${spec_file}
Expand All @@ -66,7 +67,12 @@ prepare_spec() {
fi

local git_dir=$(dirname $(find "${root_dir}/sources/${repo_name}" -name .git | head -1))
local full_commit=$(git -C "${git_dir}" rev-parse HEAD)
if [ "${spec_name}" = "pmm-ui" ]; then
full_commit=$(get_shasum256 "${git_dir}/ui")
else
full_commit=$(git -C "${git_dir}" rev-parse HEAD)
fi

local short_commit=${full_commit:0:7}
local tar_archive=${rpmbuild_dir}/${repo_name}-${short_commit}.tar.gz

Expand All @@ -75,12 +81,7 @@ prepare_spec() {
exit 1
fi

if [ "${spec_name}" = "pmm-ui" ]; then
local hash=$(get_shasum256 "${git_dir}/ui")
sed -i -e "s/global commit.*/global commit ${hash:0:7}/" ${spec_file}
else
sed -i -e "s/global commit.*/global commit ${full_commit}/" ${spec_file}
fi
sed -i -e "s/global commit.*/global commit ${full_commit}/" ${spec_file}

if [ "${spec_name}" != "grafana" ]; then
sed -i -e "s/Version:.*/Version: ${pmm_version}/" ${spec_file}
Expand Down

0 comments on commit 29adcec

Please sign in to comment.