Use release version instead of build.date in the delta file name

Change-Id: I9ccb90efaaf519ee4e7926562c9d3c77931c6a2c

diff --git a/mk_delta/action.yml b/mk_delta/action.yml
index b57d016..4d490bb 100644 (file)
--- a/mk_delta/action.yml
+++ b/mk_delta/action.yml
@@ -230,15 +230,17 @@ runs:
         source images/result/*/FW_DELTA/DELTA/update-info.ini
         set +x
         tz_build_release_name=${tz_build_release_name//\//_}
-        BUILD_STRING=$(cat images/result/*/FW_DELTA/DELTA/build_string.txt | sed "s/_/\./g")
 
+        OLD_RELEASE_VERSION=$(ls images/old/*tar.gz | head -n 1 | sed 's/.*\([0-9]\{8\}\.[0-9]\{6\}\).*/\1/')
+        NEW_RELEASE_VERSION=$(ls images/new/*tar.gz | head -n 1 | sed 's/.*\([0-9]\{8\}\.[0-9]\{6\}\).*/\1/')
+        VERSION_TAG="${OLD_RELEASE_VERSION}@${NEW_RELEASE_VERSION}"
         # Build file name
         DELTA_BUILD_TIMESTAMP=$(TZ=GMT date +"%Y%m%d.%H%M%S")
         # ARTIFACT_FILE_NAME_BASE=${device_type}--${model_name}--${{ inputs.image_type }}--${tz_build_arch}  # TODO: Use it once `tz_build_arch` correctly distinguishes between armv7l and armv7hl.
         ARTIFACT_FILE_NAME_BASE=${device_type}--${model_name}--${{ inputs.image_type }}--${{ inputs.arch }}
         TAG_SUFFIX="$([[ "${{ inputs.docker_image_tag }}" == "latest" ]] && echo "" || echo "--${{ inputs.docker_image_tag }}")"
-        ARTIFACT_FILE_NAME_LATEST=${OUTPUT_REPO_DIR}/${tz_build_release_name}/${ARTIFACT_FILE_NAME_BASE}--${BUILD_STRING}${TAG_SUFFIX}.tar.gz
-        ARTIFACT_FILE_NAME_ARCHIVE=${OUTPUT_REPO_DIR}/${tz_build_release_name}/archive/${ARTIFACT_FILE_NAME_BASE}--${BUILD_STRING}--${DELTA_BUILD_TIMESTAMP}.tar.gz
+        ARTIFACT_FILE_NAME_LATEST=${OUTPUT_REPO_DIR}/${tz_build_release_name}/${ARTIFACT_FILE_NAME_BASE}--${VERSION_TAG}${TAG_SUFFIX}.tar.gz
+        ARTIFACT_FILE_NAME_ARCHIVE=${OUTPUT_REPO_DIR}/${tz_build_release_name}/archive/${ARTIFACT_FILE_NAME_BASE}--${VERSION_TAG}--${DELTA_BUILD_TIMESTAMP}.tar.gz
 
         JF_UPLOAD="jf rt u --flat=true --fail-no-op=true"