Skip to content

Commit 1d7f484

Browse files
authored
fix: Remove retry from Windows pipelines (#1576)
* fix: Remove retry from Windows pipelines * Adding in make command for windows NPM * fixing an issue with retry * adding a retry on task
1 parent a2231de commit 1d7f484

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

.pipelines/containers/container-template-windows.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@ steps:
1313

1414
- powershell: |
1515
echo "using tag ${{ parameters.tag }}"
16-
powershell.exe -command "& { . .\build\scripts\windows.ps1; Retry({${{ parameters.name }}-image windows-${{ parameters.arch }}-${{ parameters.tag }}}) }"
16+
powershell.exe -command "& { . .\build\scripts\windows.ps1; ${{ parameters.name }}-image windows-${{ parameters.arch }}-${{ parameters.tag }} }"
1717
name: image_build
1818
displayName: Image Build
19+
retryCountOnTaskFailure: 3
1920

2021
- powershell: |
2122
$registry = "acnpublic.azurecr.io"

Makefile

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,19 @@ npm-image: ## build the npm container image.
364364
EXTRA_BUILD_ARGS='--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)' \
365365
TAG=$(NPM_PLATFORM_TAG)
366366

367+
npm-image-windows: ## build the npm container windows image.
368+
$(MKDIR) $(IMAGE_DIR);
369+
docker build \
370+
--no-cache \
371+
-f cns/windows.Dockerfile \
372+
-t $(IMAGE_REGISTRY)/$(NPM_IMAGE)-win:$(NPM_PLATFORM_TAG) \
373+
--build-arg VERSION=$(NPM_VERSION) \
374+
--build-arg NPM_AI_PATH=$(NPM_AI_PATH) \
375+
--build-arg NPM_AI_ID=$(NPM_AI_ID) \
376+
.
377+
378+
echo $(NPM_IMAGE)-win:$(NPM_VERSION) > $(IMAGE_DIR)/$(NPM_IMAGE_INFO_FILE)
379+
367380
npm-image-push: ## push npm container image.
368381
$(MAKE) container-push \
369382
IMAGE=$(NPM_IMAGE) \

0 commit comments

Comments
 (0)