2f767593ef
Add command to update the subtree from a child repo. This pushes to the main branch of the common repo with only the relevant commits.
24 lines
629 B
Makefile
24 lines
629 B
Makefile
SHELL := /bin/bash
|
|
|
|
IMAGE ?= $(shell cat IMAGE):$(shell cat VERSION)
|
|
IMAGE_LATEST ?= $(shell cat IMAGE):latest
|
|
PWD ?= $(shell pwd)
|
|
|
|
include .gitlab/make/docker.makefile
|
|
include .gitlab/make/helm.makefile
|
|
include .gitlab/make/kaniko.makefile
|
|
include .gitlab/make/truenas.makefile
|
|
|
|
.PHONY: make-update
|
|
make-update:
|
|
@git stash
|
|
-git subtree pull --prefix .gitlab git@gitlab.ducoterra.net:services/common.git main --squash
|
|
@git stash pop
|
|
|
|
.PHONY: make-push
|
|
make-push:
|
|
@make make-update
|
|
@git remote add common git@gitlab.ducoterra.net:services/common.git
|
|
@git subtree push --prefix .gitlab common main
|
|
@git remote remove common
|