From 7d99ce2cad17e7ebdf0c65d6586d845bfd9fab8e Mon Sep 17 00:00:00 2001 From: Shamil Mubarakshin <127750046+shamil-mubarakshin@users.noreply.github.com> Date: Mon, 26 Jun 2023 19:44:27 +0200 Subject: [PATCH] Update SBOM report workflow's version-check job (#7793) --- .github/workflows/create_sbom_report.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/create_sbom_report.yml b/.github/workflows/create_sbom_report.yml index 00ca3a3e..0041ba5e 100644 --- a/.github/workflows/create_sbom_report.yml +++ b/.github/workflows/create_sbom_report.yml @@ -20,8 +20,11 @@ jobs: steps: - name: Available image version check for ${{ github.event.client_payload.ReleaseBranchName }} run: | - if ($env:ImageVersion -ne '${{ github.event.client_payload.imageVersion }}') { - throw "Current runner $env:ImageVersion image version don't match ${{ github.event.client_payload.imageVersion }}." + $imageVersionComponents = $env:ImageVersion.Split('.') + $imageMajorVersion = $imageVersionComponents[0] + $imageMinorVersion = $imageVersionComponents[1] + if ("$imageMajorVersion.$imageMinorVersion" -ne '${{ github.event.client_payload.imageVersion }}') { + throw "Current runner $imageMajorVersion.$imageMinorVersion image version doesn't match ${{ github.event.client_payload.imageVersion }}." } #Install and run SYFT, compress SBOM, upload it to release assets create-sbom: