e7b07c7f84
22a952dRemove warning from make-update0f6eeb7Add make-stash-drop commandf81d846Only pop stash if changesafed93fAdd warning to make-update and make-push6239af7Ignore git stash pop failures git-subtree-dir: .gitlab git-subtree-split:22a952dd53
35 lines
1.1 KiB
Makefile
35 lines
1.1 KiB
Makefile
SHELL := /bin/bash
|
|
|
|
IMAGE ?= $(shell cat IMAGE):$(shell cat VERSION)
|
|
IMAGE_LATEST ?= $(shell cat IMAGE):latest
|
|
PWD ?= $(shell pwd)
|
|
STASH ?= "common-update-stash"
|
|
|
|
include .gitlab/make/docker.makefile
|
|
include .gitlab/make/helm.makefile
|
|
include .gitlab/make/kaniko.makefile
|
|
include .gitlab/make/truenas.makefile
|
|
|
|
.PHONY: warning
|
|
warning:
|
|
@printf "Running a potentially destructive command. If a conflict occurs, fix the conflict and re-run the command.\n"
|
|
@printf "Cancel with ctrl + c within 3 seconds."
|
|
@sleep 3
|
|
|
|
.PHONY: make-stash-drop
|
|
make-stash-drop:
|
|
@if [ ! -z "$$(git stash list | grep -r 'stash@{0}.*common')" ]; then git stash drop; fi
|
|
|
|
.PHONY: make-update
|
|
make-update:
|
|
@git stash save $(STASH)
|
|
-git subtree pull --prefix .gitlab git@gitlab.ducoterra.net:services/common.git main --squash
|
|
@if [ ! -z "$$(git stash list | grep -r 'stash@{0}.*common')" ]; then git stash pop; fi
|
|
|
|
.PHONY: make-push
|
|
make-push: warning
|
|
@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
|