Skip to content

update edge #478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
harryhmc merged 8 commits into from
Feb 16, 2024
Merged

update edge #478

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
604f774
adding logging
harryhmc Feb 16, 2024
65105bb
crappy logging
harryhmc Feb 16, 2024
aa69f9c
adding backticks
harryhmc Feb 16, 2024
c4a55ba
backticks
harryhmc Feb 16, 2024
fd7b46d
allow no match
harryhmc Feb 16, 2024
a0d76d5
fix version parsing
harryhmc Feb 16, 2024
07aaaca
Merge branch 'master' into APM-000-fix-version-parsing
harryhmc Feb 16, 2024
bf072df
Merge pull request #477 from NHSDigital/APM-000-fix-version-parsing
harryhmc Feb 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions azure/templates/deploy-service.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ steps:
export SOURCE_COMMIT_ID=$(Build.SourceVersion)
export RELEASE_RELEASEID=$(Build.BuildId)

ASSUMED_VERSION=$(echo $SERVICE_ARTIFACT_NAME | grep -E -o "v[0-9]+\.[0-9]+\.[0-9]+-?[a-z]*" | tail -1)
export ASSUMED_VERSION=`echo $SERVICE_ARTIFACT_NAME | ( grep -E -o "v[0-9]+\.[0-9]+\.[0-9]+-?[a-z]*" || true ) | tail -1`
if [[ ! -z $ASSUMED_VERSION ]]; then
export DEPLOYED_VERSION=$ASSUMED_VERSION
else
Expand Down Expand Up @@ -203,8 +203,9 @@ steps:

source $(SERVICE_DIR)/.build_env_vars

if [[ $SERVICE_ARTIFACT_NAME == v* ]]; then
export DEPLOYED_VERSION=`echo $SERVICE_ARTIFACT_NAME | grep -E -o "v[0-9]+\.[0-9]+\.[0-9]+-?[a-z]*" | tail -1`
export ASSUMED_VERSION=`echo $SERVICE_ARTIFACT_NAME | ( grep -E -o "v[0-9]+\.[0-9]+\.[0-9]+-?[a-z]*" || true ) | tail -1`
if [[ ! -z $ASSUMED_VERSION ]]; then
export DEPLOYED_VERSION=$ASSUMED_VERSION
else
export DEPLOYED_VERSION="${{ parameters.fully_qualified_service_name }}"
fi
Expand Down