Skip to content

Commit

Permalink
Correct regex used to extract version for tags
Browse files Browse the repository at this point in the history
  • Loading branch information
webbnh committed Aug 31, 2023
1 parent eb53f19 commit d6ea9d0
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion agent/containers/images/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ ifdef CI
if [[ -z "${_RPM_PATH}" ]] ; then echo "No RPM found with ID ${_LOCAL_GIT_HASH} for ${_LOCAL_MAJORMINOR} in ${CI_RPM_LOC}" >&2 ; exit 2 ; fi
if grep ' ' <<< ${_RPM_PATH} ; then echo "Multiple RPMs found: ${_RPM_PATH}" >&2 ; exit 2 ; fi
printf -- "%s\n" ${_LOCAL_GIT_HASH} > ${@}
printf -- "v%s\n" "$(shell grep -Eo '[0-9]+\.[0-9]+\.([0-9]+(-[0-9]+)?)?' <<< "${_RPM_PATH}")" >> ${@}
printf -- "v%s\n" "$(shell grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+(-[0-9]+)?)?' <<< "${_RPM_PATH}")" >> ${@}
printf -- "v%s-latest v%s-latest\n" ${_LOCAL_MAJOR_VER} ${_LOCAL_MAJORMINOR} >> ${@}
else
./gen-tags-from-rpm "${URL_PREFIX}" "$(subst centos,epel,$*)" "${_ARCH}" "${_PBENCH_REPO_NAME}" > ${@}
Expand Down

0 comments on commit d6ea9d0

Please sign in to comment.