Skip to content

Commit

Permalink
ci(dra): version should not include the qualifier (#15278) (#15279)
Browse files Browse the repository at this point in the history
(cherry picked from commit 9e6c6c6)

Co-authored-by: Victor Martinez <[email protected]>
  • Loading branch information
mergify[bot] and v1v authored Jan 17, 2025
1 parent e8d89e7 commit 50cc844
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .buildkite/scripts/dra.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ set -eo pipefail
# Either staging or snapshot
TYPE="$1"

## Read current version.
VERSION=$(make get-version)
## Read current version without the qualifier
VERSION=$(make get-version-only)

echo "--- Restoring Artifacts"
buildkite-agent artifact download "build/**/*" .
Expand Down
5 changes: 5 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,11 @@ endif
get-version:
@echo $(APM_SERVER_VERSION)

## get-version-only : Get the apm server version without the qualifier
.PHONY: get-version-only
get-version-only:
@echo $(APM_SERVER_ONLY_VERSION)

# update-go-version updates .go-version, documentation, and build files
# to use the most recent patch version for the major.minor Go version
# defined in go.mod.
Expand Down

0 comments on commit 50cc844

Please sign in to comment.