From 24b0e699e4f893077c360bcfcd41b8ca911b1c19 Mon Sep 17 00:00:00 2001 From: Damien Grisonnet <dgrisonn@redhat.com> Date: Mon, 16 Aug 2021 18:51:30 +0200 Subject: [PATCH] .github: fix automated update in CI Automated dependencies update in CI was failing whenever no new changes were detected since git diff was returning 1. Signed-off-by: Damien Grisonnet <dgrisonn@redhat.com> --- .github/workflows/versions.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/versions.yaml b/.github/workflows/versions.yaml index 7cb75ae4..5807f5e1 100644 --- a/.github/workflows/versions.yaml +++ b/.github/workflows/versions.yaml @@ -35,8 +35,8 @@ jobs: make generate # Reset jsonnetfile.lock.json if no dependencies were updated - changedFiles=$(git diff --name-only | grep -v 'jsonnetfile.lock.json') - if [[ $changedFiles == "" ]]; then + changedFiles=$(git diff --name-only | grep -v 'jsonnetfile.lock.json' | wc -l) + if [[ "$changedFiles" -eq 0 ]]; then git checkout -- jsonnetfile.lock.json; fi - name: Create Pull Request -- GitLab