Files
the-1122-pack/Makefile
ducoterra 6239af7f74 Ignore git stash pop failures
In the event the stash is empty, don't run stash pop.
2021-11-01 09:23:36 -04:00

24 lines
673 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
@if [-z "$(shell git stash list)"; then git stash pop; fi;
.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