services/Common
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow pulling specific branch with BRANCH_NAME

Browse Source 
Allow make-update and make-add to specify a branch name to pull an
update from.
This commit is contained in:
ducoterra
2021-12-12 19:00:46 -05:00
parent bce675fbd2
commit 71ff227953
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@@ -6,6 +6,7 @@ IMAGE ?= $(shell cat IMAGE):$(VERSION)
IMAGE_LATEST ?= $(shell cat IMAGE):latest IMAGE_LATEST ?= $(shell cat IMAGE):latest
PWD ?= $(shell pwd) PWD ?= $(shell pwd)
STASH ?= "common-update-stash" STASH ?= "common-update-stash"
MAKE_BRANCH ?= main
include .gitlab/make/docker.makefile include .gitlab/make/docker.makefile
include .gitlab/make/helm.makefile include .gitlab/make/helm.makefile
@@ -14,6 +15,9 @@ include .gitlab/make/truenas.makefile
include .gitlab/make/git.makefile include .gitlab/make/git.makefile
include .gitlab/make/kubectl.makefile include .gitlab/make/kubectl.makefile
# git subtree add --prefix .gitlab --squash --message "Merge update from Common" -q git@gitlab.ducoterra.net:services/common.git main
# git reset head~1
.PHONY: make-update .PHONY: make-update
make-update: make-update:
@git subtree pull --prefix .gitlab --squash --message "Merge update from Common" -q git@gitlab.ducoterra.net:services/common.git main @git subtree pull --prefix .gitlab --squash --message "Merge update from Common" -q git@gitlab.ducoterra.net:services/common.git $(MAKE_BRANCH)
@git reset head~1