From a871670c76da8d431152fb6320e2c192d29c99b0 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Sat, 10 Feb 2024 01:56:31 +0900 Subject: [PATCH] Prepare universal workflow --- .github/workflows/images_build_windows.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/images_build_windows.yml b/.github/workflows/images_build_windows.yml index 49fc45a49..6c5156557 100644 --- a/.github/workflows/images_build_windows.yml +++ b/.github/workflows/images_build_windows.yml @@ -399,7 +399,7 @@ jobs: run: | $base_image_file=$Env:BASE_BUILD_NAME + '_' + $Env:MATRIX_OS + '_' + $Env:MATRIX_COMPONENT $base_tag = Get-Content $base_image_file -Raw - $build_base_image="$Env:MATRIX_COMPONENT/$Env:IMAGE_PREFIX$Env:BASE_BUILD_NAME@" + $base_tag + $build_base_image="$Env:DOCKER_REPOSITORY/$Env:IMAGE_PREFIX$Env:BASE_BUILD_NAME@" + $base_tag echo "::group::Base image Info" echo "base_tag=$base_tag" @@ -415,9 +415,9 @@ jobs: OIDC_ISSUER: ${{ env.OIDC_ISSUER }} IDENITY_REGEX: ${{ env.IDENITY_REGEX }} run: | - cosign verify \ - --certificate-oidc-issuer-regexp "$Env:OIDC_ISSUER" \ - --certificate-identity-regexp "$Env:IDENITY_REGEX" \ + cosign verify ` + --certificate-oidc-issuer-regexp "$Env:OIDC_ISSUER" ` + --certificate-identity-regexp "$Env:IDENITY_REGEX" ` "$Env:BASE_IMAGE" - name: Build and push image @@ -643,9 +643,9 @@ jobs: OIDC_ISSUER: ${{ env.OIDC_ISSUER }} IDENITY_REGEX: ${{ env.IDENITY_REGEX }} run: | - cosign verify \ - --certificate-oidc-issuer-regexp "$Env:OIDC_ISSUER" \ - --certificate-identity-regexp "$Env:IDENITY_REGEX" \ + cosign verify ` + --certificate-oidc-issuer-regexp "$Env:OIDC_ISSUER" ` + --certificate-identity-regexp "$Env:IDENITY_REGEX" ` "$Env:BASE_IMAGE" - name: Build and push image