From dafae304759a2d390253d554c8561d9446f77590 Mon Sep 17 00:00:00 2001 From: Arcadiy Ivanov Date: Fri, 29 Dec 2023 14:46:40 -0500 Subject: [PATCH] Force git to clobber tags in the git cache Release 1.0.12 fixes #43 --- build.py | 2 +- src/main/python/kubernator/api.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.py b/build.py index 2e75392..db29163 100644 --- a/build.py +++ b/build.py @@ -27,7 +27,7 @@ use_plugin("filter_resources") name = "kubernator" -version = "1.0.11" +version = "1.0.12" summary = "Kubernator is the a pluggable framework for K8S provisioning" authors = [Author("Express Systems USA, Inc.", "")] diff --git a/src/main/python/kubernator/api.py b/src/main/python/kubernator/api.py index abbbc64..f13c6f3 100644 --- a/src/main/python/kubernator/api.py +++ b/src/main/python/kubernator/api.py @@ -740,7 +740,7 @@ def init(self, logger, context): self.local_dir) run(["git", "config", "remote.origin.fetch", f"+refs/heads/{ref}:refs/remotes/origin/{ref}"], stdout_logger, stderr_logger, cwd=git_cache).wait() - run(["git", "fetch", "-pPt"], stdout_logger, stderr_logger, cwd=git_cache).wait() + run(["git", "fetch", "-pPt", "--force"], stdout_logger, stderr_logger, cwd=git_cache).wait() run(["git", "checkout", ref], stdout_logger, stderr_logger, cwd=git_cache).wait() run(["git", "clean", "-f"], stdout_logger, stderr_logger, cwd=git_cache).wait() run(["git", "reset", "--hard", ref, "--"], stdout_logger, stderr_logger, cwd=git_cache).wait()