From a2dd91d69ba2ffbd4c593ca072f86a6bd7577b59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kirill=20M=C3=BCller?= Date: Sun, 8 Dec 2024 08:06:48 +0100 Subject: [PATCH] ci: Avoid failure in fledge workflow if no changes (#479) * ci: Avoid failure in fledge workflow if no changes * chore: Auto-update from GitHub Actions Run: https://github.com/r-dbi/RPostgres/actions/runs/12219704090 --- .github/dep-suggests-matrix.json | 1 - .github/versions-matrix.json | 1 - .github/workflows/fledge.yaml | 12 ++++++++---- 3 files changed, 8 insertions(+), 6 deletions(-) delete mode 100644 .github/dep-suggests-matrix.json delete mode 100644 .github/versions-matrix.json diff --git a/.github/dep-suggests-matrix.json b/.github/dep-suggests-matrix.json deleted file mode 100644 index c96dbee1..00000000 --- a/.github/dep-suggests-matrix.json +++ /dev/null @@ -1 +0,0 @@ -{"package":["covr","DBItest"]} diff --git a/.github/versions-matrix.json b/.github/versions-matrix.json deleted file mode 100644 index 5af4434a..00000000 --- a/.github/versions-matrix.json +++ /dev/null @@ -1 +0,0 @@ -{"include":[{"os":"macos-latest","r":"4.4"},{"os":"macos-latest","r":"4.3"},{"os":"windows-latest","r":"devel"},{"os":"windows-latest","r":"4.4"},{"os":"windows-latest","r":"4.3"},{"os":"ubuntu-22.04","r":"devel","http-user-agent":"release"},{"os":"ubuntu-22.04","r":"4.4"},{"os":"ubuntu-22.04","r":"4.3"},{"os":"ubuntu-22.04","r":"4.2"},{"os":"ubuntu-22.04","r":"4.1"},{"os":"ubuntu-22.04","r":"4.0"},{"os":"ubuntu-22.04","r":"4.4","covr":"true","desc":"with covr"}]} diff --git a/.github/workflows/fledge.yaml b/.github/workflows/fledge.yaml index 6c167c23..5b2131ae 100644 --- a/.github/workflows/fledge.yaml +++ b/.github/workflows/fledge.yaml @@ -104,10 +104,14 @@ jobs: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - set -x - gh pr create --base main --head fledge --fill-first - gh workflow run rcc -f ref=$(git rev-parse HEAD) - gh pr merge --squash --auto + set -ex + if [ -n "$(git diff main --numstat)" ]; then + gh pr create --base main --head fledge --fill-first + gh workflow run rcc -f ref=$(git rev-parse HEAD) + gh pr merge --squash --auto + else + echo "No changes." + fi shell: bash - name: Check release