services/minecraft_vanilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only pop stash if changes

Browse Source 
Only pop the stash if the most recent stash commit matches the STASH
name.
This commit is contained in:
ducoterra
2021-11-01 09:56:37 -04:00
parent afed93f58a
commit f81d846f31
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@@ -3,6 +3,7 @@ SHELL := /bin/bash
IMAGE ?= $(shell cat IMAGE):$(shell cat VERSION) IMAGE ?= $(shell cat IMAGE):$(shell cat VERSION)
IMAGE_LATEST ?= $(shell cat IMAGE):latest IMAGE_LATEST ?= $(shell cat IMAGE):latest
PWD ?= $(shell pwd) PWD ?= $(shell pwd)
STASH ?= "common-update-stash"
include .gitlab/make/docker.makefile include .gitlab/make/docker.makefile
include .gitlab/make/helm.makefile include .gitlab/make/helm.makefile
@@ -17,9 +18,9 @@ warning:
.PHONY: make-update .PHONY: make-update
make-update: warning make-update: warning
@git stash @git stash save $(STASH)
-git subtree pull --prefix .gitlab git@gitlab.ducoterra.net:services/common.git main --squash -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; @if [ ! -z "$$(git stash list | grep -r 'stash@{0}.*common')" ]; then git stash pop; fi
.PHONY: make-push .PHONY: make-push
make-push: warning make-push: warning