services/the-1122-pack
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge update from Common

Browse Source
This commit is contained in:
ducoterra
2021-12-13 12:06:42 -05:00
parent 8b0a8fab1f a13cfe64d0
commit 84abbd4cab
3 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab/Makefile
View File

@@ -6,6 +6,7 @@ IMAGE ?= $(shell cat IMAGE):$(VERSION)
IMAGE_LATEST ?= $(shell cat IMAGE):latest
PWD ?= $(shell pwd)
STASH ?= "common-update-stash"
MAKE_BRANCH ?= main
include .gitlab/make/docker.makefile
include .gitlab/make/helm.makefile
@@ -14,6 +15,7 @@ include .gitlab/make/truenas.makefile
include .gitlab/make/git.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
.PHONY: 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)