From 70e32ef1aa65c459fb4e8277b8e6676c05cb67b5 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Thu, 28 Sep 2023 13:22:47 +0000 Subject: [PATCH] Squashed '.ci/' changes from 318c19e..c1a48a6 c1a48a6 Remove auto stash push / pop as being too dangerous git-subtree-dir: .ci git-subtree-split: c1a48a6aede4a08ad1e230121bf8b085ce9ef9e6 --- podman.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman.mk b/podman.mk index 02e0475..817d524 100644 --- a/podman.mk +++ b/podman.mk @@ -78,7 +78,7 @@ rm-image: ## some useful tasks during development ci-pull-upstream: ## pull latest shared .ci subtree - git stash && git subtree pull --prefix .ci ssh://git@git.zero-downtime.net/ZeroDownTime/ci-tools-lib.git master --squash -m "Merge latest ci-tools-lib" && git stash pop + git subtree pull --prefix .ci ssh://git@git.zero-downtime.net/ZeroDownTime/ci-tools-lib.git master --squash -m "Merge latest ci-tools-lib" create-repo: ## create new AWS ECR public repository aws ecr-public create-repository --repository-name $(IMAGE) --region $(REGION)