From be48f1cf0900719091c43fbb476943abf8739d40 Mon Sep 17 00:00:00 2001 From: Smriti Dahal Date: Wed, 14 Aug 2024 17:03:48 -0700 Subject: [PATCH 1/4] fix regex in release pipeline --- .github/workflows/create-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 28f63485..c3650d28 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -39,7 +39,7 @@ jobs: name: set-tags run: | echo "release-tag=$(echo ${{ github.event.pull_request.head.ref }} | tr '-' '\n' | grep 'v[0-9]\.[0-9]\.[0-9]' | head -n 1)" >> $GITHUB_OUTPUT - echo "init-tag=$(echo ${{ github.event.pull_request.head.ref }} | tr '-' '\n' | grep 'v[0-9]\.[0-9]\.[0-9]' | sed -n '2p')" >> $GITHUB_OUTPUT + echo "init-tag=$(echo ${{ github.event.pull_request.head.ref }} | tr '-' '\n' | grep '[0-9]\.[0-9]\.[0-9]' | sed -n '2p')" >> $GITHUB_OUTPUT - id: check-tag name: Check for Tag From b79689400bd9bef5d202ba0a596a8c97928f0b60 Mon Sep 17 00:00:00 2001 From: Smriti Dahal Date: Wed, 14 Aug 2024 17:04:10 -0700 Subject: [PATCH 2/4] revert --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 781b8f2f..85934430 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ TEST_CREDENTIALS_JSON ?= $(TEST_CREDENTIALS_DIR)/credentials.json TEST_LOGANALYTICS_JSON ?= $(TEST_CREDENTIALS_DIR)/loganalytics.json export TEST_CREDENTIALS_JSON TEST_LOGANALYTICS_JSON TEST_AKS_CREDENTIALS_JSON -VERSION ?= v1.6.2 +VERSION ?= v1.6.1 REGISTRY ?= ghcr.io IMG_NAME ?= virtual-kubelet INIT_IMG_NAME ?= init-validation @@ -35,7 +35,7 @@ E2E_CLUSTER_NAME := $(CLUSTER_NAME) OUTPUT_TYPE ?= type=docker BUILDPLATFORM ?= linux/amd64 IMG_TAG ?= $(subst v,,$(VERSION)) -INIT_IMG_TAG ?= 0.3.0 +INIT_IMG_TAG ?= 0.2.0 BUILD_DATE ?= $(shell date '+%Y-%m-%dT%H:%M:%S') VERSION_FLAGS := "-ldflags=-X main.buildVersion=$(IMG_TAG) -X main.buildTime=$(BUILD_DATE)" From d38b92808f2804be93405cdd711a056678846008 Mon Sep 17 00:00:00 2001 From: Smriti Dahal Date: Wed, 14 Aug 2024 19:48:22 -0700 Subject: [PATCH 3/4] update regex --- .github/workflows/create-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index c3650d28..f0cd25d6 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -39,7 +39,7 @@ jobs: name: set-tags run: | echo "release-tag=$(echo ${{ github.event.pull_request.head.ref }} | tr '-' '\n' | grep 'v[0-9]\.[0-9]\.[0-9]' | head -n 1)" >> $GITHUB_OUTPUT - echo "init-tag=$(echo ${{ github.event.pull_request.head.ref }} | tr '-' '\n' | grep '[0-9]\.[0-9]\.[0-9]' | sed -n '2p')" >> $GITHUB_OUTPUT + echo "init-tag=$(echo ${{ github.event.pull_request.head.ref }} | tr '-' '\n' | grep -E '^[0-9]+\.[0-9]+\.[0-9]+$' | sed -n '1p')" >> $GITHUB_OUTPUT - id: check-tag name: Check for Tag From 2205766731e9756bcedae3786b08416dcfea4b2d Mon Sep 17 00:00:00 2001 From: Smriti Dahal Date: Wed, 14 Aug 2024 20:01:12 -0700 Subject: [PATCH 4/4] update regex --- .github/workflows/create-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index f0cd25d6..689cdfbc 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -39,7 +39,7 @@ jobs: name: set-tags run: | echo "release-tag=$(echo ${{ github.event.pull_request.head.ref }} | tr '-' '\n' | grep 'v[0-9]\.[0-9]\.[0-9]' | head -n 1)" >> $GITHUB_OUTPUT - echo "init-tag=$(echo ${{ github.event.pull_request.head.ref }} | tr '-' '\n' | grep -E '^[0-9]+\.[0-9]+\.[0-9]+$' | sed -n '1p')" >> $GITHUB_OUTPUT + echo "init-tag=$(echo ${{ github.event.pull_request.head.ref }} | tr '-' '\n' | grep -E '^[0-9]\.[0-9]\.[0-9]$' | head -n 1)" >> $GITHUB_OUTPUT - id: check-tag name: Check for Tag