66b4fdb902
Rather than potentially leaving the developer in a state where `git stash pop` wasn't run, ignore failures in git subtree and let the developer fix issues and re-run the command. This makes `make-update` more idempotent.
17 lines
436 B
Makefile
17 lines
436 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
|