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

Merge branch 'allow-specify-branch' into 'main'

Browse Source 
Allow pulling specific branch with BRANCH_NAME

See merge request services/common!8
This commit is contained in:
Reese
2021-12-13 00:18:38 +00:00
parent 64304160b9 4de5558b63
commit ba2827a8fe
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
.gitlab

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