Skip to content

Commit

Permalink
Merge pull request #121 from sclorg/do_no_print_diff
Browse files Browse the repository at this point in the history
Do not print `git diff` output.
  • Loading branch information
phracek authored Sep 16, 2024
2 parents 4f04b40 + d4cea0f commit 272e979
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-and-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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" \
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions betka/git.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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+",
Expand Down

0 comments on commit 272e979

Please sign in to comment.