From 461ddc41d1117db5023a886af5ff9eca7fadbac6 Mon Sep 17 00:00:00 2001 From: lumbrjx Date: Thu, 29 Aug 2024 23:23:51 +0100 Subject: [PATCH 1/2] naming --- .github/workflows/{docker-image.yml => builds.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{docker-image.yml => builds.yml} (100%) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/builds.yml similarity index 100% rename from .github/workflows/docker-image.yml rename to .github/workflows/builds.yml From 374d7774efcbb1aa86d36552ae3b32923ccfc66f Mon Sep 17 00:00:00 2001 From: lumbrjx Date: Thu, 29 Aug 2024 23:28:09 +0100 Subject: [PATCH 2/2] Update :sparkles: makefile --- Makefile | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/Makefile b/Makefile index 5c38d86..82e2bcb 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,37 @@ VALIDATE_PATH = $(GOPATH)/pkg/mod/github.com/envoyproxy/protoc-gen-validate@v1.1.0 SOURCE_DIR=common/proto/$$PROTO_PATH/$$PROTO_PATH TARGET_DIR=common/proto/$$PROTO_PATH +DEV_BRANCH = dev +STAGING_BRANCH = staging +RELEASE_BRANCH = release +MAIN_BRANCH = main .PHONY: all generate-proto build-daemon all: create-cluster deploy-controller deploy-daemonset setup-prometheus port-forward-prometheus +dev-to-staging: + @git checkout $(STAGING_BRANCH) + @git merge $(DEV_BRANCH) + @git push origin $(STAGING_BRANCH) + @echo "Merged $(DEV_BRANCH) to $(STAGING_BRANCH) and pushed to origin." + +staging-to-release: dev-to-staging release + @git checkout $(RELEASE_BRANCH) + @git merge $(STAGING_BRANCH) + @git push origin $(RELEASE_BRANCH) + @echo "Merged $(STAGING_BRANCH) to $(RELEASE_BRANCH) and pushed to origin." + +release-to-main: staging-to-release + @git checkout $(MAIN_BRANCH) + @git merge $(RELEASE_BRANCH) + @git push origin $(MAIN_BRANCH) + @echo "Merged $(RELEASE_BRANCH) to $(MAIN_BRANCH) and pushed to origin." + +# Full pipeline (runs all steps) +pipeline: release-to-main + @echo "Pipeline completed successfully." + build-daemon: @if [ -z "$$TAG" ]; then \ echo "Usage: make build-daemon TAG="; \