Skip to content

Commit

Permalink
ci: Add master branch to release pipeline (#639)
Browse files Browse the repository at this point in the history
Signed-off-by: Heba <[email protected]>
  • Loading branch information
helayoty authored Aug 13, 2024
1 parent ceff38e commit 6208ff2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/create-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: Create release
on:
pull_request:
branches:
- master
- release-**-**
types: [ closed ]

Expand Down Expand Up @@ -113,4 +114,4 @@ jobs:
uses: ./.github/workflows/publish-init-container-image.yml
with:
registry: ${{ needs.export-registry.outputs.registry }}
init_container_version: ${{ needs.check-tag.outputs.init-tag }}
init_container_version: ${{ needs.check-tag.outputs.init-tag }}
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -35,7 +35,7 @@ E2E_CLUSTER_NAME := $(CLUSTER_NAME)
OUTPUT_TYPE ?= type=docker
BUILDPLATFORM ?= linux/amd64
IMG_TAG ?= $(subst v,,$(VERSION))
INIT_IMG_TAG ?= v0.3.0
INIT_IMG_TAG ?= v0.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)"
Expand Down

0 comments on commit 6208ff2

Please sign in to comment.