Skip to content

Commit ea655b0

Browse files
huntergregoryvakalapa
authored andcommitted
ci: [WIN-NPM] remove ws19 build (#1844)
* remove NPM build for ws19 * set OS versions by variable in manifest-build --------- Co-authored-by: Vamsi Kalapala <[email protected]>
1 parent 1ed4a3d commit ea655b0

File tree

2 files changed

+14
-19
lines changed

2 files changed

+14
-19
lines changed

.pipelines/pipeline.yaml

+1-6
Original file line numberDiff line numberDiff line change
@@ -179,11 +179,6 @@ stages:
179179
arch: amd64
180180
name: npm
181181
os: linux
182-
npm_windows2019_amd64:
183-
arch: amd64
184-
name: npm
185-
os: windows
186-
os_version: ltsc2019
187182
npm_windows2022_amd64:
188183
arch: amd64
189184
name: npm
@@ -285,7 +280,7 @@ stages:
285280
platforms: linux/amd64 linux/arm64 windows/amd64
286281
npm:
287282
name: npm
288-
os_versions: ltsc2019 ltsc2022
283+
os_versions: ltsc2022
289284
platforms: linux/amd64 linux/arm64 windows/amd64
290285
steps:
291286
- template: containers/manifest-template.yaml

Makefile

+13-13
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ azure-ipam: azure-ipam-binary azure-ipam-archive
140140

141141
revision: ## print the current git revision
142142
@echo $(REVISION)
143-
143+
144144
version: ## prints the root version
145145
@echo $(ACN_VERSION)
146146

@@ -159,15 +159,15 @@ cni-dropgz-test-version: ## prints the cni-dropgz version
159159
@echo $(CNI_DROPGZ_TEST_VERSION)
160160

161161
cns-version:
162-
@echo $(CNS_VERSION)
162+
@echo $(CNS_VERSION)
163163

164164
npm-version:
165-
@echo $(NPM_VERSION)
165+
@echo $(NPM_VERSION)
166166

167167
zapai-version: ## prints the zapai version
168168
@echo $(ZAPAI_VERSION)
169169

170-
##@ Binaries
170+
##@ Binaries
171171

172172
# Build the delegated IPAM plugin binary.
173173
azure-ipam-binary:
@@ -507,8 +507,8 @@ manifest-build: # util target to compose multiarch container manifests from plat
507507
$(MAKE) manifest-add PLATFORM=$(PLATFORM);\
508508
)\
509509
)\
510-
511-
510+
511+
512512

513513
manifest-push: # util target to push multiarch container manifest.
514514
$(CONTAINER_BUILDER) manifest push --all $(IMAGE_REGISTRY)/$(IMAGE):$(TAG) docker://$(IMAGE_REGISTRY)/$(IMAGE):$(TAG)
@@ -532,7 +532,7 @@ acncli-manifest-push: ## push acncli multiplat container manifest
532532
acncli-skopeo-archive: ## export tar archive of acncli multiplat container manifest.
533533
$(MAKE) manifest-skopeo-archive \
534534
IMAGE=$(ACNCLI_IMAGE) \
535-
TAG=$(ACN_VERSION)
535+
TAG=$(ACN_VERSION)
536536

537537
cni-dropgz-manifest-build: ## build cni-dropgz multiplat container manifest.
538538
$(MAKE) manifest-build \
@@ -684,7 +684,7 @@ ifeq ($(GOOS),linux)
684684
endif
685685

686686

687-
##@ Utils
687+
##@ Utils
688688

689689
clean: ## Clean build artifacts.
690690
$(RMDIR) $(OUTPUT_DIR)
@@ -715,7 +715,7 @@ workspace: ## Set up the Go workspace.
715715
go work use ./dropgz
716716
go work use ./zapai
717717

718-
##@ Test
718+
##@ Test
719719

720720
COVER_PKG ?= .
721721
#Restart case is used for cni load test pipeline for restarting the nodes cluster.
@@ -773,7 +773,7 @@ gitconfig: ## configure the local git repository
773773
setup: tools install-hooks gitconfig ## performs common required repo setup
774774

775775

776-
##@ Tools
776+
##@ Tools
777777

778778
$(TOOLS_DIR)/go.mod:
779779
cd $(TOOLS_DIR); go mod init && go mod tidy
@@ -783,7 +783,7 @@ $(CONTROLLER_GEN): $(TOOLS_DIR)/go.mod
783783

784784
controller-gen: $(CONTROLLER_GEN) ## Build controller-gen
785785

786-
protoc:
786+
protoc:
787787
source ${REPO_ROOT}/scripts/install-protoc.sh
788788

789789
$(GOCOV): $(TOOLS_DIR)/go.mod
@@ -816,13 +816,13 @@ $(MOCKGEN): $(TOOLS_DIR)/go.mod
816816

817817
mockgen: $(MOCKGEN) ## Build mockgen
818818

819-
clean-tools:
819+
clean-tools:
820820
rm -r build/tools/bin
821821

822822
tools: acncli gocov gocov-xml go-junit-report golangci-lint gofumpt protoc ## Build bins for build tools
823823

824824

825-
##@ Help
825+
##@ Help
826826

827827
help: ## Display this help
828828
@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n make \033[36m<target>\033[0m\n"} /^[a-zA-Z_-]+:.*?##/ { printf " \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)

0 commit comments

Comments
 (0)