From d4cea0f76a5475232b1acaa0c7b2f5b6ed7146d2 Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Mon, 16 Sep 2024 12:31:21 +0200 Subject: [PATCH] Do not print `git diff` output. Signed-off-by: Petr "Stone" Hracek --- .github/workflows/build-and-push.yml | 2 +- Dockerfile | 2 +- Makefile | 2 +- betka/git.py | 8 ++++---- setup.py | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml index 1370e8b..846f60d 100644 --- a/.github/workflows/build-and-push.yml +++ b/.github/workflows/build-and-push.yml @@ -20,7 +20,7 @@ jobs: with: dockerfiles: ./Dockerfile image: betka - tags: latest 1 ${{ github.sha }} 0.7.13 + tags: latest 1 ${{ github.sha }} 0.7.14 - name: Push betka image to Quay.io id: push-to-quay diff --git a/Dockerfile b/Dockerfile index e9d215d..0df278e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM quay.io/fedora/fedora:37 ENV NAME=betka-fedora \ - RELEASE=0.7.13 \ + RELEASE=0.7.14 \ ARCH=x86_64 \ SUMMARY="Syncs changes from upstream repository to downstream" \ DESCRIPTION="Syncs changes from upstream repository to downstream" \ diff --git a/Makefile b/Makefile index 9ec47b6..277d6de 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ TEST_IMAGE_NAME = betka-test DEPLOY_NAME = quay.io/rhscl/betka-deployment UNAME=$(shell uname) ifeq ($(UNAME),Darwin) - PODMAN := /usr/local/bin/podman #docker + PODMAN := /opt/podman/bin/podman #docker else PODMAN := /usr/bin/podman endif diff --git a/betka/git.py b/betka/git.py index a88356a..9dc01b3 100644 --- a/betka/git.py +++ b/betka/git.py @@ -65,10 +65,10 @@ def git_add_all(upstream_msg: str, related_msg: str) -> bool: :param upstream_msg: :param related_msg: """ - git_show_status = Git.call_git_cmd( - "diff HEAD", ignore_error=True, msg="Check git status" - ) - logger.debug(f"Show git diff {git_show_status}") + #git_show_status = Git.call_git_cmd( + # "diff HEAD", ignore_error=True, msg="Check git status" + #) + #logger.debug(f"Show git diff {git_show_status}") Git.call_git_cmd("add -A", msg="Add all") upstream_msg += f"\n{related_msg}\n" diff --git a/setup.py b/setup.py index 3ed79dc..3cf8e27 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ def get_requirements(): setup( name="betka", - version="0.7.13", + version="0.7.14", packages=find_packages(exclude=["examples", "tests"]), url="https://github.com/sclorg/betka", license="GPLv3+",